Adapt to new CMake macros in KERNEL and GUI

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 96f656def6ebd19a2802216d53bd70122c1d86ab..c08749d0815c60103bd4a27f7f11437317ec5fa4 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,9 +34,10 @@ SET(CMAKE_MODULE_PATH ${KERNEL_ROOT_DIR}/salome_adm/cmake_files
                       ${GUI_ROOT_DIR}/adm_local/cmake_files)
 
 FIND_PACKAGE(OMNIORB)
-FIND_PACKAGE(PYTHON)
-FIND_PACKAGE(SPHINX)
-FIND_PACKAGE(SIPPYQT)
+FIND_PACKAGE(SalomePYTHON)
+FIND_PACKAGE(SalomeSPHINX)
+FIND_PACKAGE(SalomeSIP)
+FIND_PACKAGE(SalomePYQT4)
 
 SET(BINDIR bin/salome)
 SET(RESDIR share/salome/resources/parametric)

diff --git a/src/salome/parametric/gui/CMakeLists.txt b/src/salome/parametric/gui/CMakeLists.txt
index 89f17ca1ee4112d1e04122f400de6a7d33f995c9..0bf08b17e2f4882c807648132f0c1544264db8b6 100644 (file)
--- a/src/salome/parametric/gui/CMakeLists.txt
+++ b/src/salome/parametric/gui/CMakeLists.txt
@@ -23,7 +23,7 @@ FOREACH(OUTPUT ${PYUIC_FILES})
   SET(INPUT ${CMAKE_CURRENT_SOURCE_DIR}/${INPUT})
   SET(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT})
   ADD_CUSTOM_COMMAND(OUTPUT ${OUTPUT}
-                     COMMAND ${PYUIC_EXECUTABLE} -o ${OUTPUT} ${INPUT}
+                     COMMAND ${PYQT_PYUIC_EXECUTABLE} -o ${OUTPUT} ${INPUT}
                      MAIN_DEPENDENCY ${INPUT}
                     )
   INSTALL(FILES ${OUTPUT} DESTINATION ${INSTALL_DIR})