X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESH_SWIG_WITHIHM%2FCMakeLists.txt;h=9b52ec3bf4216b535654a12bf0b134bebfa8a967;hb=8af480d8934d988fbefe45f08ffd868d43f7cf28;hp=4132fa9a31887dda89af12777b08218ea7e5a4a2;hpb=7eda9ca931ed2a11cb5e4637e4ffe19f5c061115;p=modules%2Fsmesh.git diff --git a/src/SMESH_SWIG_WITHIHM/CMakeLists.txt b/src/SMESH_SWIG_WITHIHM/CMakeLists.txt index 4132fa9a3..9b52ec3bf 100644 --- 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} - ${CAS_INCLUDE_DIRS} + ${OpenCASCADE_INCLUDE_DIR} ${VTK_INCLUDE_DIRS} ${OGL_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS} @@ -43,7 +43,7 @@ INCLUDE_DIRECTORIES( # additional preprocessor / compiler flags ADD_DEFINITIONS( - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ${OMNIORB_DEFINITIONS} ${PYTHON_DEFINITIONS} ) @@ -52,6 +52,7 @@ ADD_DEFINITIONS( SET(_link_LIBRARIES ${KERNEL_SalomeGenericObj} ${KERNEL_SALOMELocalTrace} + ${KERNEL_SalomeKernelHelpers} ${GUI_CAM} ${GUI_suit} ${GUI_qtx} @@ -84,7 +85,7 @@ SET_DIRECTORY_PROPERTIES(PROPERTIES INCLUDE_DIRECTORIES "${_cmake_include_direct # swig flags SET_SOURCE_FILES_PROPERTIES(libSMESH_Swig.i PROPERTIES CPLUSPLUS ON) -SET_SOURCE_FILES_PROPERTIES(libSMESH_Swig.i PROPERTIES SWIG_DEFINITIONS "-shadow") +SET_SOURCE_FILES_PROPERTIES(libSMESH_Swig.i PROPERTIES SWIG_FLAGS "-py3") SET_SOURCE_FILES_PROPERTIES(libSMESH_swig_wrap.cpp PROPERTIES COMPILE_FLAGS "-DHAVE_CONFIG_H") # --- scripts --- @@ -98,6 +99,7 @@ SET(_swig_SCRIPTS SWIG_ADD_MODULE(libSMESH_Swig python ${SMESH_Swig_SOURCES}) SWIG_LINK_LIBRARIES(libSMESH_Swig ${_link_LIBRARIES}) +SWIG_CHECK_GENERATION(libSMESH_Swig) IF(WIN32) SET_TARGET_PROPERTIES(_libSMESH_Swig PROPERTIES DEBUG_OUTPUT_NAME _libSMESH_Swig_d) ENDIF(WIN32)