To make Pmml tests work outside Salome environment

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

diff --git a/src/yacsloader/CMakeLists.txt b/src/yacsloader/CMakeLists.txt
index 2a1cd1b05796ff55d481deb33f812922b50fb21b..43c1f2f68e52a9d0b1fc0409ad9991ef7922094d 100644 (file)
--- a/src/yacsloader/CMakeLists.txt
+++ b/src/yacsloader/CMakeLists.txt
@@ -1,9 +1,9 @@
-# Copyright (C) 2012-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-2014  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
@@ -18,7 +18,8 @@
 #
 
 IF(SALOME_BUILD_TESTS)
-#TODO:  ADD_SUBDIRECTORY( Test )
+  ADD_SUBDIRECTORY(Test)
+  ADD_SUBDIRECTORY(pmml)  
 ENDIF(SALOME_BUILD_TESTS)
 
 # --- options ---
@@ -62,13 +63,9 @@ INCLUDE_DIRECTORIES(
 
 # additional preprocessor / compiler flags
 ADD_DEFINITIONS(
-  -DYACS_PTHREAD
   ${PYTHON_DEFINITIONS}
   ${OMNIORB_DEFINITIONS}
   )
-IF(WIN32)
-  ADD_DEFINITIONS(-DNOGDI)
-ENDIF(WIN32)
 SET(_exec_DEFINITIONS
   -g
   )
@@ -173,5 +170,6 @@ INSTALL(FILES ${YACSloader_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
 
 FILE(GLOB sample_files
   ${PROJECT_SOURCE_DIR}/src/yacsloader/samples/*.xml 
+  ${PROJECT_SOURCE_DIR}/src/yacsloader/samples/*.pmml
   ${PROJECT_SOURCE_DIR}/src/yacsloader/samples/*.data)
 INSTALL(FILES ${sample_files} DESTINATION ${SALOME_YACS_INSTALL_SAMPLES})