X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2Fruntime_swig%2FCMakeLists.txt;h=90efb777f50b70b6b4f6c3ff39063d11ef56e433;hb=HEAD;hp=43661cf3e035e1d08adf29a50b41a1bf977e5e93;hpb=7e344a8f0ce7aa46093bd7c23add2186ffc44d06;p=modules%2Fyacs.git

diff --git a/src/runtime_swig/CMakeLists.txt b/src/runtime_swig/CMakeLists.txt
index 43661cf3e..90efb777f 100644
--- a/src/runtime_swig/CMakeLists.txt
+++ b/src/runtime_swig/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2016  CEA/DEN, EDF R&D
+# Copyright (C) 2012-2024  CEA, EDF
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -27,9 +27,11 @@ ENDIF(SALOME_YACS_USE_KERNEL)
 
 # additional include directories
 INCLUDE_DIRECTORIES(
+  ${CMAKE_CURRENT_SOURCE_DIR}
   ${SALOME_INCL_PATH}
   ${PTHREAD_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
+  ${OMNIORBPY_INCLUDE_DIR}
   ${LIBXML2_INCLUDE_DIR}
   ${PYTHON_INCLUDE_DIRS}
   ${PROJECT_BINARY_DIR}/idl
@@ -54,9 +56,14 @@ ADD_DEFINITIONS(
   ${OMNIORB_DEFINITIONS}
   )
 
+ADD_LIBRARY(YACSRuntimePython ThreadLauncher.cxx)
+TARGET_LINK_LIBRARIES(YACSRuntimePython YACSRuntimeSALOME ${PYTHON_LIBRARIES} )
+INSTALL(TARGETS YACSRuntimePython EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
+
 # libraries to link to
 SET(_link_LIBRARIES
   YACSRuntimeSALOME
+  YACSRuntimePython
   ${PYTHON_LIBRARIES}
   ${OMNIORB_LIBRARIES}
   )
@@ -92,19 +99,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
   )
 SET(SWIG_MODULE_SALOMERuntime_EXTRA_DEPS 
-		${PROJECT_SOURCE_DIR}/src/engine_swig/pilot.i 
-		${PROJECT_SOURCE_DIR}/src/engine_swig/engtypemaps.i 
-		docruntime.i 
-		${SWIGINCLUDES})
-SWIG_ADD_MODULE(SALOMERuntime python SALOMERuntime.i)
+    ${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}")