Fix regression (hang-up of build procedure on Linux) caused by latest changes (Window...

diff --git a/src/engine_swig/CMakeLists.txt b/src/engine_swig/CMakeLists.txt
index 4333da677bf1a13fdc252b866511dc0b353cc797..4af959f2c2ad8019bd60e586d63b9628ec1a4e7f 100644 (file)
--- a/src/engine_swig/CMakeLists.txt
+++ b/src/engine_swig/CMakeLists.txt
@@ -89,12 +89,12 @@ SET(_swig_SCRIPTS
 
 IF(WIN32)
   SET(SET_CMD set)
+  SET(SEP_CMD &&)
 ENDIF(WIN32)
 
 IF(SALOME_BUILD_DOC)
   ADD_CUSTOM_TARGET(docengine.i
-    ${SET_CMD} DOXSRCDIR=${PROJECT_SOURCE_DIR}/src/engine 
-    COMMAND ${DOXYGEN_EXECUTABLE} ${PROJECT_SOURCE_DIR}/Misc/Doxyfile
+    ${SET_CMD} DOXSRCDIR=${PROJECT_SOURCE_DIR}/src/engine ${SEP_CMD} ${DOXYGEN_EXECUTABLE} ${PROJECT_SOURCE_DIR}/Misc/Doxyfile
     COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/Misc/doxy2swig.py -n xml/index.xml docengine.i
     VERBATIM
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}

diff --git a/src/runtime_swig/CMakeLists.txt b/src/runtime_swig/CMakeLists.txt
index 5777320beae1988478dcf2ce86bf23f60cab2278..fd96ad4f627a938f595e8798d90bd2185646e148 100644 (file)
--- a/src/runtime_swig/CMakeLists.txt
+++ b/src/runtime_swig/CMakeLists.txt
@@ -73,13 +73,12 @@ SET(_swig_SCRIPTS
 
 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 
-    COMMAND ${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}

diff --git a/src/salomegui_swig/CMakeLists.txt b/src/salomegui_swig/CMakeLists.txt
index f169724fceb71bc616225f7341bc0de4ce66c966..7bb5b256eca577d165219dddd2a805e0945f8680 100644 (file)
--- a/src/salomegui_swig/CMakeLists.txt
+++ b/src/salomegui_swig/CMakeLists.txt
@@ -70,13 +70,12 @@ SET(_swig_SCRIPTS
 
 IF(WIN32)
   SET(SET_CMD set)
+  SET(SEP_CMD &&)
 ENDIF(WIN32)
 
-
 IF(SALOME_BUILD_DOC)
   ADD_CUSTOM_TARGET(doc.i
-    ${SET_CMD} DOXSRCDIR=${CMAKE_CURRENT_SOURCE_DIR} 
-    COMMAND ${DOXYGEN_EXECUTABLE} ${PROJECT_SOURCE_DIR}/Misc/Doxyfile
+    ${SET_CMD} DOXSRCDIR=${CMAKE_CURRENT_SOURCE_DIR} ${SEP_CMD} ${DOXYGEN_EXECUTABLE} ${PROJECT_SOURCE_DIR}/Misc/Doxyfile
     COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/Misc/doxy2swig.py -n xml/index.xml doc.i
     DEPENDS YACSGUI_Swig.hxx YACSGUI_Swig.cxx
     VERBATIM

diff --git a/src/yacsloader_swig/CMakeLists.txt b/src/yacsloader_swig/CMakeLists.txt
index a2e205893db23602ef82b2c9e849b2885364f5fe..0fc081081d63246615405ab3604235dab43f8788 100644 (file)
--- a/src/yacsloader_swig/CMakeLists.txt
+++ b/src/yacsloader_swig/CMakeLists.txt
@@ -69,13 +69,12 @@ SET(_swig_SCRIPTS
 
 IF(WIN32)
   SET(SET_CMD set)
+  SET(SEP_CMD &&)
 ENDIF(WIN32)
 
-
 IF(SALOME_BUILD_DOC)
   ADD_CUSTOM_TARGET(docyacsloader.i
-    ${SET_CMD} DOXSRCDIR=${PROJECT_SOURCE_DIR}/src/yacsloader 
-    COMMAND ${DOXYGEN_EXECUTABLE} ${PROJECT_SOURCE_DIR}/Misc/Doxyfile
+    ${SET_CMD} DOXSRCDIR=${PROJECT_SOURCE_DIR}/src/yacsloader ${SEP_CMD} ${DOXYGEN_EXECUTABLE} ${PROJECT_SOURCE_DIR}/Misc/Doxyfile
     COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/Misc/doxy2swig.py -n xml/index.xml docyacsloader.i
     VERBATIM
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}