CMake:

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

diff --git a/src/yacsloader_swig/CMakeLists.txt b/src/yacsloader_swig/CMakeLists.txt
index a2e205893db23602ef82b2c9e849b2885364f5fe..8a0816e980283163a975e9c8a867dec1d63d96de 100644 (file)
--- a/src/yacsloader_swig/CMakeLists.txt
+++ b/src/yacsloader_swig/CMakeLists.txt
@@ -20,7 +20,7 @@
 INCLUDE(${SWIG_USE_FILE})
 
 IF(SALOME_BUILD_TESTS)
-#TODO:  ADD_SUBDIRECTORY( Test )
+  ADD_SUBDIRECTORY(Test)
 ENDIF(SALOME_BUILD_TESTS)
 
 # --- options ---
@@ -46,7 +46,6 @@ SET_PROPERTY(SOURCE loader.i PROPERTY
 
 # additional preprocessor / compiler flags
 ADD_DEFINITIONS(
-  -DYACS_PTHREAD
   ${PYTHON_DEFINITIONS}
   ${OMNIORB_DEFINITIONS}
   )
@@ -69,13 +68,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}