From 74309c7dfab26cbdd00bd67ab6ca7600f5d74506 Mon Sep 17 00:00:00 2001 From: Renaud Barate Date: Fri, 15 Feb 2013 18:09:40 +0100 Subject: [PATCH] Adapt to new CMake macros in KERNEL and GUI --- CMakeLists.txt | 7 ++++--- src/salome/parametric/gui/CMakeLists.txt | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 96f656d..c08749d 100644 --- 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 89f17ca..0bf08b1 100644 --- 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}) -- 2.39.2