]> SALOME platform Git repositories - samples/hello.git/commitdiff
Salome HOME
Fix problem with parallel building (make -j) caused by previous commit V9_9_0a1 V9_9_0a2
authorvsr <vsr@opencascade.com>
Tue, 18 Jan 2022 09:13:32 +0000 (12:13 +0300)
committervsr <vsr@opencascade.com>
Tue, 18 Jan 2022 09:13:32 +0000 (12:13 +0300)
src/HELLO_SWIG/CMakeLists.txt

index 4f25c0e06488f59350c2cb132226cdfba561089b..bfab586b07bd282c9c10a67412b4337e303df108 100644 (file)
@@ -17,9 +17,9 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-include(${SWIG_USE_FILE})
+INCLUDE(${SWIG_USE_FILE})
 
-include_directories(
+INCLUDE_DIRECTORIES(
   ${KERNEL_INCLUDE_DIRS}
   ${PROJECT_BINARY_DIR}/idl
   ${PROJECT_SOURCE_DIR}/src/HELLO
@@ -27,7 +27,6 @@ include_directories(
 
 SET(_bin_SCRIPTS
   HELLO_SalomeSessionless.py
-  ${CMAKE_CURRENT_BINARY_DIR}/HelloHelper.py
 )
 
 # additional preprocessor / compiler flags
@@ -39,7 +38,7 @@ SET(HelloHelper_SOURCES HelloHelper.cxx ${HelloHelper_HEADERS})
 SET_SOURCE_FILES_PROPERTIES(HelloHelper.i PROPERTIES CPLUSPLUS ON)
 SET_SOURCE_FILES_PROPERTIES(HelloHelper.i PROPERTIES SWIG_FLAGS "-py3")
 SET_SOURCE_FILES_PROPERTIES(HelloHelper_wrap.cpp PROPERTIES COMPILE_FLAGS "-DHAVE_CONFIG_H")
-#SET(_swig_SCRIPTS ${CMAKE_CURRENT_BINARY_DIR}/HelloHelper.py )
+SET(_swig_SCRIPTS ${CMAKE_CURRENT_BINARY_DIR}/HelloHelper.py )
 IF(${CMAKE_VERSION} VERSION_LESS "3.8.0") 
   SWIG_ADD_MODULE(HelloHelper python ${HelloHelper_SOURCES})
 ELSE()
@@ -50,8 +49,7 @@ SWIG_CHECK_GENERATION(HelloHelper)
 IF(WIN32)
   SET_TARGET_PROPERTIES(_HelloHelper PROPERTIES DEBUG_OUTPUT_NAME _HelloHelper_d)
 ENDIF(WIN32)
-install(TARGETS _HelloHelper DESTINATION ${SALOME_INSTALL_LIBS})
-install(FILES ${HelloHelper_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
+INSTALL(TARGETS _HelloHelper DESTINATION ${SALOME_INSTALL_LIBS})
+INSTALL(FILES ${HelloHelper_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
 SALOME_INSTALL_SCRIPTS("${_swig_SCRIPTS}"  ${SALOME_INSTALL_BINS} EXTRA_DPYS "${SWIG_MODULE_HelloHelper_REAL_NAME}")
-
 SALOME_INSTALL_SCRIPTS("${_bin_SCRIPTS}" ${SALOME_INSTALL_PYTHON} DEF_PERMS)