CMake: simplifying Python detection mechanism.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e5d92d840288a11ec4158051e3038b89de6b8157..72c40e90d22cf1524634a701e28eee9b6a11a65d 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -124,7 +124,8 @@ ENDIF()
 ##
 
 # Mandatory products
-FIND_PACKAGE(SalomePython    REQUIRED)
+FIND_PACKAGE(SalomePythonInterp REQUIRED)
+FIND_PACKAGE(SalomePythonLibs REQUIRED)
 FIND_PACKAGE(SalomePThread   REQUIRED)
 ADD_DEFINITIONS(-DYACS_PTHREAD)
 FIND_PACKAGE(SalomeBoost     REQUIRED)

diff --git a/src/pmml/CMakeLists.txt b/src/pmml/CMakeLists.txt
index edce25e130c31b6a167cc2acceb68aa49ac3cc7f..386db0879dd63ad19f958cc8d0be783f549343c8 100755 (executable)
--- a/src/pmml/CMakeLists.txt
+++ b/src/pmml/CMakeLists.txt
@@ -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)