Fix configuration problem with native Qt4 (as on CentOS 6.3)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c37c098bfdbdbb96290644b72c12252449a4244a..ae3bbc391105ad114391148b63665cf1e3afd1a0 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,6 +56,9 @@ FIND_PACKAGE(SalomeSWIG REQUIRED)
 FIND_PACKAGE(SalomeCppUnit REQUIRED)
 FIND_PACKAGE(SalomeDoxygen REQUIRED)
 
+# From GUI: part 1 (Qt must be checked before ParaView)
+FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui QtXml QtHelp)
+
 # Specific to ParaVis:
 FIND_PACKAGE(SalomeParaView)
 IF(TARGET vtkTools)
@@ -66,17 +69,8 @@ endif()
 # well with the VTK one (and GUI loads VTK):
 FIND_PACKAGE(SalomeGUI REQUIRED)
 
-# From GUI:
+# From GUI: part 2
 FIND_PACKAGE(SalomeCAS REQUIRED)
-FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui QtXml QtHelp)
-message("QT_INCLUDES ${QT_INCLUDES}")
-SET(_new_inc)
-FOREACH(_inc ${QT_INCLUDES})
-  SET(_new_inc "${_new_inc} -I${_inc}")
-ENDFOREACH()
-SET(QT_INCLUDES "${_new_inc}")
-message("QT_INCLUDES ${QT_INCLUDES}")
-
 FIND_PACKAGE(SalomeOpenGL REQUIRED)
 FIND_PACKAGE(SalomeVTK REQUIRED)
 FIND_PACKAGE(SalomeQwt REQUIRED)

diff --git a/src/PVGUI/CMakeLists.txt b/src/PVGUI/CMakeLists.txt
index 45eea7d1d1f9d5321e2487ffdc1d1c1d8252ae67..1e25024484072952afff7b258318bcfde5d68797 100644 (file)
--- a/src/PVGUI/CMakeLists.txt
+++ b/src/PVGUI/CMakeLists.txt
@@ -30,7 +30,9 @@ INCLUDE_DIRECTORIES(${OMNIORB_INCLUDE_DIR}
     ${PROJECT_BINARY_DIR} 
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CAS_INCLUDE_DIRS} 
-    ${Boost_INCLUDE_DIRS})
+    ${Boost_INCLUDE_DIRS}
+    ${QT_INCLUDES}
+    )
 
 INCLUDE(${QT_USE_FILE})
 
@@ -128,7 +130,6 @@ SET(MOC_FILES
 # Note that ParaView uses HDF5
 SET(libPARAVIS_la_CPPFLAGS
   -ftemplate-depth-32
-  ${QT_INCLUDES}
   ${QT_ASSISTANT_INCLUDES}
   ${PYTHON_INCLUDES}
   ${CAS_CPPFLAGS}