Fix async optimizer loop with no point to evaluate.

[modules/yacs.git] / src / runtime_swig / CMakeLists.txt

diff --git a/src/runtime_swig/CMakeLists.txt b/src/runtime_swig/CMakeLists.txt
old mode 100755 (executable)
new mode 100644 (file)
index 44622a7..45e54e5
--- a/src/runtime_swig/CMakeLists.txt
+++ b/src/runtime_swig/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2014  CEA/DEN, EDF R&D
+# Copyright (C) 2012-2019  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -30,6 +30,7 @@ INCLUDE_DIRECTORIES(
   ${SALOME_INCL_PATH}
   ${PTHREAD_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
+  ${OMNIORBPY_INCLUDE_DIR}
   ${LIBXML2_INCLUDE_DIR}
   ${PYTHON_INCLUDE_DIRS}
   ${PROJECT_BINARY_DIR}/idl
@@ -92,20 +93,25 @@ SET(SWIGINCLUDES
   ${PROJECT_SOURCE_DIR}/src/runtime/CORBAPorts.hxx
   ${PROJECT_SOURCE_DIR}/src/runtime/TypeConversions.hxx
   ${PROJECT_SOURCE_DIR}/src/runtime/SalomeOptimizerLoop.hxx
+  ${PROJECT_SOURCE_DIR}/src/runtime/VisitorSalomeSaveState.hxx
   )
-SWIG_ADD_MODULE(SALOMERuntime python SALOMERuntime.i)
-ADD_DEPENDENCIES(_SALOMERuntime 
-                  SALOMERuntime.i 
-                  ${PROJECT_SOURCE_DIR}/src/engine_swig/pilot.i 
-                  ${PROJECT_SOURCE_DIR}/src/engine_swig/engtypemaps.i 
-                  docruntime.i 
-                  ${SWIGINCLUDES})
+SET(SWIG_MODULE_SALOMERuntime_EXTRA_DEPS 
+    ${PROJECT_SOURCE_DIR}/src/engine_swig/pilot.i 
+    ${PROJECT_SOURCE_DIR}/src/engine_swig/engtypemaps.i  
+    ${SWIGINCLUDES})
+
+IF(${CMAKE_VERSION} VERSION_LESS "3.8.0") 
+  SWIG_ADD_MODULE(SALOMERuntime python SALOMERuntime.i)
+ELSE()
+  SWIG_ADD_LIBRARY(SALOMERuntime LANGUAGE python SOURCES SALOMERuntime.i)
+ENDIF()
 
 SWIG_LINK_LIBRARIES(SALOMERuntime ${_link_LIBRARIES})
+SWIG_CHECK_GENERATION(SALOMERuntime)
 IF(WIN32)
   SET_TARGET_PROPERTIES(_SALOMERuntime PROPERTIES DEBUG_OUTPUT_NAME _SALOMERuntime_d)
 ENDIF(WIN32)
 
 INSTALL(TARGETS ${SWIG_MODULE_SALOMERuntime_REAL_NAME} DESTINATION ${SALOME_INSTALL_PYTHON})
 
-SALOME_INSTALL_SCRIPTS("${_swig_SCRIPTS}"  ${SALOME_INSTALL_PYTHON})
+SALOME_INSTALL_SCRIPTS("${_swig_SCRIPTS}"  ${SALOME_INSTALL_PYTHON} EXTRA_DPYS "${SWIG_MODULE_SALOMERuntime_REAL_NAME}")