Error management in py2yacs.

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

diff --git a/src/pmml/CMakeLists.txt b/src/pmml/CMakeLists.txt
old mode 100755 (executable)
new mode 100644 (file)
index a6709da..2f4810a
--- a/src/pmml/CMakeLists.txt
+++ b/src/pmml/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2014  CEA/DEN, EDF R&D
+# Copyright (C) 2012-2019  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
@@ -44,9 +44,11 @@ IF(URANIE AND WIN32)
 ENDIF(URANIE AND WIN32) 
 
 IF(SALOME_YACS_USE_SWIG)
-       FIND_PACKAGE(SalomePython)
+       FIND_PACKAGE(SalomePythonInterp REQUIRED)
+       FIND_PACKAGE(SalomePythonLibs REQUIRED)
        FIND_PACKAGE(SalomeSWIG)
-       SALOME_LOG_OPTIONAL_PACKAGE(Python SALOME_YACS_USE_SWIG)
+       SALOME_LOG_OPTIONAL_PACKAGE(PythonInterp SALOME_YACS_USE_SWIG)
+       SALOME_LOG_OPTIONAL_PACKAGE(PythonLibs SALOME_YACS_USE_SWIG)
        SALOME_LOG_OPTIONAL_PACKAGE(SWIG   SALOME_YACS_USE_SWIG)
 ENDIF(SALOME_YACS_USE_SWIG)
 
@@ -66,7 +68,6 @@ IF(SALOME_YACS_USE_SWIG)
     "Install path: SALOME Python shared modules")
 ENDIF(SALOME_YACS_USE_SWIG)
 
-SET(SALOME_INSTALL_RES share/salome/resources CACHE PATH "Install path: SALOME resources")
 SET(SALOME_PMML_INSTALL_RES_DATA "${SALOME_INSTALL_RES}/pmml" CACHE PATH "Install path: SALOME PMML specific data")
 
 # Sources 
@@ -92,8 +93,6 @@ SET(pmml_SOURCES
   PMMLlib.cxx
   )
 
-ADD_SUBDIRECTORY(resources)
-
 ADD_LIBRARY(pmmlLib SHARED ${pmml_SOURCES})
 TARGET_LINK_LIBRARIES(pmmlLib  ${LIBXML2_LIBRARIES} ) 
 INSTALL(TARGETS pmmlLib EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
@@ -111,7 +110,12 @@ ENDIF (NOT URANIE)
 
 
 IF(SALOME_BUILD_TESTS)
+    SET(LOCAL_TEST_DIR ${SALOME_YACS_INSTALL_TEST}/pmml)
+    INSTALL(FILES CTestTestfileInstall.cmake
+            DESTINATION ${LOCAL_TEST_DIR}
+            RENAME CTestTestfile.cmake)
     ADD_SUBDIRECTORY(Test)
+
 ENDIF(SALOME_BUILD_TESTS)