CMake bug fix: improper SWIG dependencies.

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

diff --git a/src/runtime_swig/CMakeLists.txt b/src/runtime_swig/CMakeLists.txt
index d16e18382b3145d65a58b619e4e6b3d2a6d5160b..43661cf3e035e1d08adf29a50b41a1bf977e5e93 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-2016  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
@@ -40,9 +40,6 @@ INCLUDE_DIRECTORIES(
   ${PROJECT_SOURCE_DIR}/src/engine_swig
   ${PROJECT_SOURCE_DIR}/src/runtime
 )
-IF(WIN32)
-  ADD_DEFINITIONS(-DNOGDI)
-ENDIF(WIN32)
 
 # swig flags
 SET_SOURCE_FILES_PROPERTIES(SALOMERuntime.i PROPERTIES 
@@ -55,7 +52,6 @@ SET_PROPERTY(SOURCE SALOMERuntime.i PROPERTY
 ADD_DEFINITIONS(
   ${PYTHON_DEFINITIONS}
   ${OMNIORB_DEFINITIONS}
-  -DYACS_PTHREAD
   )
 
 # libraries to link to
@@ -71,9 +67,14 @@ SET(_swig_SCRIPTS
   ${CMAKE_CURRENT_BINARY_DIR}/SALOMERuntime.py
 )
 
+IF(WIN32)
+  SET(SET_CMD set)
+  SET(SEP_CMD &&)
+ENDIF(WIN32)
+
 IF(SALOME_BUILD_DOC)
   ADD_CUSTOM_TARGET(docruntime.i
-    COMMAND DOXSRCDIR=${PROJECT_SOURCE_DIR}/src/runtime ${DOXYGEN_EXECUTABLE} ${PROJECT_SOURCE_DIR}/Misc/Doxyfile
+    ${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}
@@ -92,13 +93,12 @@ SET(SWIGINCLUDES
   ${PROJECT_SOURCE_DIR}/src/runtime/TypeConversions.hxx
   ${PROJECT_SOURCE_DIR}/src/runtime/SalomeOptimizerLoop.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)
-ADD_DEPENDENCIES(_SALOMERuntime 
-                  SALOMERuntime.i 
-                  ${PROJECT_SOURCE_DIR}/src/engine_swig/pilot.i 
-                  ${PROJECT_SOURCE_DIR}/src/engine_swig/engtypemaps.i 
-                  docruntime.i 
-                  ${SWIGINCLUDES})
 
 SWIG_LINK_LIBRARIES(SALOMERuntime ${_link_LIBRARIES})
 IF(WIN32)