Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'origin/V8_5_asterstudy'
[modules/smesh.git]
/
src
/
SMESH_SWIG_WITHIHM
/
CMakeLists.txt
diff --git
a/src/SMESH_SWIG_WITHIHM/CMakeLists.txt
b/src/SMESH_SWIG_WITHIHM/CMakeLists.txt
index 253ff7528b74ff635f49edd0bff2bbf0924f3306..7ed53786379fc2d81d70309728731c6437dfc47d 100644
(file)
--- a/
src/SMESH_SWIG_WITHIHM/CMakeLists.txt
+++ b/
src/SMESH_SWIG_WITHIHM/CMakeLists.txt
@@
-24,7
+24,7
@@
INCLUDE(${SWIG_USE_FILE})
INCLUDE_DIRECTORIES(
${QT_INCLUDES}
${PYTHON_INCLUDE_DIRS}
INCLUDE_DIRECTORIES(
${QT_INCLUDES}
${PYTHON_INCLUDE_DIRS}
- ${
CAS_INCLUDE_DIRS
}
+ ${
OpenCASCADE_INCLUDE_DIR
}
${VTK_INCLUDE_DIRS}
${OGL_INCLUDE_DIRS}
${KERNEL_INCLUDE_DIRS}
${VTK_INCLUDE_DIRS}
${OGL_INCLUDE_DIRS}
${KERNEL_INCLUDE_DIRS}
@@
-43,7
+43,7
@@
INCLUDE_DIRECTORIES(
# additional preprocessor / compiler flags
ADD_DEFINITIONS(
# additional preprocessor / compiler flags
ADD_DEFINITIONS(
- ${
CAS
_DEFINITIONS}
+ ${
OpenCASCADE
_DEFINITIONS}
${OMNIORB_DEFINITIONS}
${PYTHON_DEFINITIONS}
)
${OMNIORB_DEFINITIONS}
${PYTHON_DEFINITIONS}
)
@@
-96,8
+96,13
@@
SET(_swig_SCRIPTS
)
# --- rules ---
)
# --- rules ---
+IF(${CMAKE_VERSION} VERSION_LESS "3.8.0")
+ SWIG_ADD_MODULE(libSMESH_Swig python ${SMESH_Swig_SOURCES})
+ELSE()
+ SWIG_ADD_LIBRARY(libSMESH_Swig LANGUAGE python SOURCES ${SMESH_Swig_SOURCES})
+ENDIF()
+
-SWIG_ADD_MODULE(libSMESH_Swig python ${SMESH_Swig_SOURCES})
SWIG_LINK_LIBRARIES(libSMESH_Swig ${_link_LIBRARIES})
SWIG_CHECK_GENERATION(libSMESH_Swig)
IF(WIN32)
SWIG_LINK_LIBRARIES(libSMESH_Swig ${_link_LIBRARIES})
SWIG_CHECK_GENERATION(libSMESH_Swig)
IF(WIN32)