Work in progress save and load state.

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

diff --git a/src/runtime_swig/CMakeLists.txt b/src/runtime_swig/CMakeLists.txt
index a0cc231d5eefda4a6d1dde4704e53c215e918d58..879620de2846edaec5eeae3aa7709034c1d35790 100644 (file)
--- a/src/runtime_swig/CMakeLists.txt
+++ b/src/runtime_swig/CMakeLists.txt
@@ -1,9 +1,9 @@
-# Copyright (C) 2012-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-2015  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
 # License as published by the Free Software Foundation; either
-# version 2.1 of the License.
+# version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -52,7 +52,6 @@ SET_PROPERTY(SOURCE SALOMERuntime.i PROPERTY
 ADD_DEFINITIONS(
   ${PYTHON_DEFINITIONS}
   ${OMNIORB_DEFINITIONS}
-  -DYACS_PTHREAD
   )
 
 # libraries to link to
@@ -68,12 +67,19 @@ SET(_swig_SCRIPTS
   ${CMAKE_CURRENT_BINARY_DIR}/SALOMERuntime.py
 )
 
-ADD_CUSTOM_TARGET(docruntime.i
-  COMMAND DOXSRCDIR=${PROJECT_SOURCE_DIR}/src/runtime ${DOXYGEN_EXECUTABLE} ${PROJECT_SOURCE_DIR}/Misc/Doxyfile
-  COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/Misc/doxy2swig.py -n xml/index.xml docruntime.i
-  VERBATIM
-  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-  )
+IF(WIN32)
+  SET(SET_CMD set)
+  SET(SEP_CMD &&)
+ENDIF(WIN32)
+
+IF(SALOME_BUILD_DOC)
+  ADD_CUSTOM_TARGET(docruntime.i
+    ${SET_CMD} DOXSRCDIR=${PROJECT_SOURCE_DIR}/src/runtime ${SEP_CMD} ${DOXYGEN_EXECUTABLE} ${PROJECT_SOURCE_DIR}/Misc/Doxyfile
+    COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/Misc/doxy2swig.py -n xml/index.xml docruntime.i
+    VERBATIM
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    )
+ENDIF(SALOME_BUILD_DOC)
 
 # --- rules ---
 SET(SWIGINCLUDES 
@@ -86,6 +92,7 @@ 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 
@@ -96,9 +103,9 @@ ADD_DEPENDENCIES(_SALOMERuntime
                   ${SWIGINCLUDES})
 
 SWIG_LINK_LIBRARIES(SALOMERuntime ${_link_LIBRARIES})
-IF(WINDOWS)
+IF(WIN32)
   SET_TARGET_PROPERTIES(_SALOMERuntime PROPERTIES DEBUG_OUTPUT_NAME _SALOMERuntime_d)
-ENDIF(WINDOWS)
+ENDIF(WIN32)
 
 INSTALL(TARGETS ${SWIG_MODULE_SALOMERuntime_REAL_NAME} DESTINATION ${SALOME_INSTALL_PYTHON})