CMake: minor fix in the PYTHONPATH override when invoking PyQt4 command

Exposing GUI_INCLUDE_DIRS in config

diff --git a/adm_local/cmake_files/FindSalomePyQt4.cmake b/adm_local/cmake_files/FindSalomePyQt4.cmake
index ac20db06744420925cd4c462dc79c1e8e5a5b908..b49dc38c0269851428ad263ab7bf0ce9255ac30f 100644 (file)
--- a/adm_local/cmake_files/FindSalomePyQt4.cmake
+++ b/adm_local/cmake_files/FindSalomePyQt4.cmake
@@ -35,8 +35,8 @@ MARK_AS_ADVANCED(PYQT_PYUIC_EXECUTABLE PYQT_SIPS_DIR PYQT_PYUIC_PATH)
 # TODO: should be done like Sphinx in KERNEL (i.e. generating a shell script)?
 IF(WIN32 AND NOT CYGWIN)
   MESSAGE(WARNING "PyQt4 command was not tested under Win32")
-  SET(PYQT_PYUIC_EXECUTABLE set PYTHONPATH=${PYQT_PYTHONPATH};${SIP_PYTHONPATH} && ${PYQT_PYUIC_PATH})
+  SET(PYQT_PYUIC_EXECUTABLE set PYTHONPATH=${PYQT_PYTHONPATH};${SIP_PYTHONPATH};%PYTHONPATH% && ${PYQT_PYUIC_PATH})
 ELSE()
   SET(PYQT_PYUIC_EXECUTABLE 
-      /usr/bin/env PYTHONPATH=${PYQT_PYTHONPATH}:${SIP_PYTHONPATH}:${PYTHONPATH} ${PYQT_PYUIC_PATH})
+      /usr/bin/env PYTHONPATH="${PYQT_PYTHONPATH}:${SIP_PYTHONPATH}:$$PYTHONPATH" ${PYQT_PYUIC_PATH})
 ENDIF()

diff --git a/adm_local/cmake_files/SalomeGUIConfig.cmake.in b/adm_local/cmake_files/SalomeGUIConfig.cmake.in
index a5a1bfb9f346d9551fcd2a3a9d0d9d531dad2c53..c2c0aff05ce7c6a5f4d54bc91f9ec5559d02e86c 100644 (file)
--- a/adm_local/cmake_files/SalomeGUIConfig.cmake.in
+++ b/adm_local/cmake_files/SalomeGUIConfig.cmake.in
@@ -41,6 +41,9 @@ ENDIF()
 # Package root dir:
 SET_AND_CHECK(GUI_ROOT_DIR_EXP "@PACKAGE_CMAKE_INSTALL_PREFIX@")
 
+# Include directories
+SET_AND_CHECK(GUI_INCLUDE_DIRS "${GUI_ROOT_DIR_EXP}/@SALOME_INSTALL_HEADERS@")
+
 #### Now the specificities
 
 # Options exported by the package:

diff --git a/src/GUI_PY/CMakeLists.txt b/src/GUI_PY/CMakeLists.txt
index 102720c42ce4e55796271a870715cca43e023d1e..d67ee9ad0f5880cd056af2706b0702a23d2cbdc9 100755 (executable)
--- a/src/GUI_PY/CMakeLists.txt
+++ b/src/GUI_PY/CMakeLists.txt
@@ -44,7 +44,6 @@ FOREACH(output ${PYUIC_FILES})
     OUTPUT ${output}
     COMMAND ${PYQT_PYUIC_EXECUTABLE} -o ${output} ${input}
     MAIN_DEPENDENCY ${input}
-    VERBATIM
   )
   #${PYQT_PYUIC_EXECUTABLE}
 ENDFOREACH(output ${PYUIC_FILES})