[SCM] OCE packaging branch, debian, updated. debian/0.11-1
Denis Barbier
bouzim at gmail.com
Thu Dec 13 19:16:22 UTC 2012
The following commit has been merged in the debian branch:
commit 63eb0db7f2bfe0478740deb22332ba3c74879a60
Merge: 742837bc96e9f349c5c1627a8138a526a0016bc6 0a31157f3ed7c9492c02aebeb1055a4c1c01bbc5
Author: Denis Barbier <bouzim at gmail.com>
Date: Mon Jul 2 03:12:45 2012 -0700
Merge pull request #284 from tpaviot/review/wrap-TKQADraw
Wrap the new TKQADraw module introduced in OCCT 6.5.3
diff --combined CMakeLists.txt
index 5e1d1c2,d9169c4..1d3abf9
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -23,14 -23,14 +23,14 @@@ SET(OCE_VERSION_MAJOR 0
SET(OCE_VERSION_MINOR 10)
# OCE_VERSION_PATCH is used for bugfixes releases only
# (uncomment following line)
-# SET(OCE_VERSION_PATCH 0)
+SET(OCE_VERSION_PATCH 1)
# Empty for official releases, set to -dev, -rc1, etc for development releases
-SET(OCE_VERSION_DEVEL -rc1)
+SET(OCE_VERSION_DEVEL -dev)
# bugfix release: add ${OCE_VERSION_PATCH} to OCE_VERSION
SET(OCE_VERSION ${OCE_VERSION_MAJOR}.${OCE_VERSION_MINOR}${OCE_VERSION_DEVEL})
-SET(OCE_ABI_SOVERSION 2)
+SET(OCE_ABI_SOVERSION 3)
SET(OCE_ABI_VERSION ${OCE_ABI_SOVERSION}.0.0)
# Set the minimum version of cmake required to 2.6
@@@ -977,14 -977,9 +977,9 @@@ IF(${PROJECT_NAME}_DATAEXCHANGE
PROCESS_MODULE( "Data Exchange" "TKSTL;TKXSBase;TKSTEPBase;TKIGES;TKSTEPAttr;TKSTEP209;TKSTEP" "TKVRML;TKXCAF;TKXCAFSchema;TKXmlXCAF;TKBinXCAF;TKXDEIGES;TKXDESTEP" )
ENDIF(${PROJECT_NAME}_DATAEXCHANGE)
- # Draw
- IF(${PROJECT_NAME}_DRAW)
- PROCESS_MODULE( "Draw" "" "TKDraw;TKTopTest;TKViewerTest;TKXSDRAW;TKDCAF;TKXDEDRAW;TKTObjDRAW" )
- ENDIF(${PROJECT_NAME}_DRAW)
-
# DRAWEXE application
IF(${PROJECT_NAME}_DRAW)
- PROCESS_MODULE( "Draw" "" DRAWEXE )
+ PROCESS_MODULE( "Draw" "" "TKDraw;TKTopTest;TKViewerTest;TKXSDRAW;TKDCAF;TKXDEDRAW;TKTObjDRAW;TKQADraw;DRAWEXE" )
ENDIF(${PROJECT_NAME}_DRAW)
CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/ProjectConfig.cmake.in
--
OCE packaging
More information about the debian-science-commits
mailing list