From: bruneton <bruneton>
Date: Wed, 10 Jul 2013 07:41:44 +0000 (+0000)
Subject: CMake: minor fix in the PYTHONPATH override when invoking PyQt4 command
X-Git-Tag: B4KillOfAutomake~2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=40124ca47b16338c9b1ceeb4a8016ce3f9ebb7e3;p=modules%2Fgui.git

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 ac20db067..b49dc38c0 100644
--- 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 a5a1bfb9f..c2c0aff05 100644
--- 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 102720c42..d67ee9ad0 100755
--- 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})