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
Additional minor correction to previous commit
[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..153f400e01fe2ad6d673cc2659528e7198f27760 100644
(file)
--- a/
src/SMESH_SWIG_WITHIHM/CMakeLists.txt
+++ b/
src/SMESH_SWIG_WITHIHM/CMakeLists.txt
@@
-1,4
+1,4
@@
-# Copyright (C) 2012-201
6
CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-201
9
CEA/DEN, EDF R&D, OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@
-24,8
+24,7
@@
INCLUDE(${SWIG_USE_FILE})
INCLUDE_DIRECTORIES(
${QT_INCLUDES}
${PYTHON_INCLUDE_DIRS}
INCLUDE_DIRECTORIES(
${QT_INCLUDES}
${PYTHON_INCLUDE_DIRS}
- ${CAS_INCLUDE_DIRS}
- ${VTK_INCLUDE_DIRS}
+ ${OpenCASCADE_INCLUDE_DIR}
${OGL_INCLUDE_DIRS}
${KERNEL_INCLUDE_DIRS}
${GUI_INCLUDE_DIRS}
${OGL_INCLUDE_DIRS}
${KERNEL_INCLUDE_DIRS}
${GUI_INCLUDE_DIRS}
@@
-43,7
+42,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}
)
@@
-56,7
+55,6
@@
SET(_link_LIBRARIES
${GUI_CAM}
${GUI_suit}
${GUI_qtx}
${GUI_CAM}
${GUI_suit}
${GUI_qtx}
- ${GUI_SalomeApp}
${GUI_std}
${GUI_Event}
SMESH
${GUI_std}
${GUI_Event}
SMESH
@@
-96,8
+94,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)
@@
-108,4
+111,4
@@
INSTALL(TARGETS _libSMESH_Swig DESTINATION ${SALOME_INSTALL_LIBS})
INSTALL(FILES ${SMESH_Swig_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
INSTALL(FILES ${SMESH_Swig_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
-SALOME_INSTALL_SCRIPTS("${_swig_SCRIPTS}" ${SALOME_INSTALL_BINS})
+SALOME_INSTALL_SCRIPTS("${_swig_SCRIPTS}" ${SALOME_INSTALL_BINS}
EXTRA_DPYS "${SWIG_MODULE_libSMESH_Swig_REAL_NAME}"
)