Implementation of the "0021709: [CEA 583] Toolbar preferences" issue.

[modules/paravis.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c37c098bfdbdbb96290644b72c12252449a4244a..906d2579361b0070188df74c1083c59862b69217 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,27 +56,26 @@ 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)
+# This search for qhelpgenerator is required here
+# to avoid detecting native one due to bug in ParaViewMacros.cmake
+FIND_PROGRAM(QT_HELP_GENERATOR
+    qhelpgenerator
+    PATHS "${QT_BINARY_DIR}"
+    NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
+    DOC "qhelpgenerator used to compile Qt help project files")
+MARK_AS_ADVANCED(QT_HELP_GENERATOR)
+
 # Specific to ParaVis:
 FIND_PACKAGE(SalomeParaView)
-IF(TARGET vtkTools)
- message("bli !!")
-endif()
 
 # GUI has to be loaded AFTER ParaView: the ParaView config doesn't mix
 # 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)
@@ -104,7 +103,7 @@ FIND_PACKAGE(SalomeMED REQUIRED)
 FIND_PACKAGE(SalomeMEDFile REQUIRED)
 
 # TODO: the below requires ParaView in the PYTHONPATH ... not so nice:
-MESSAGE(STATUS "Generating wrapped class list (??) ...")
+MESSAGE(STATUS "Generating list of wrapped VTK classes ...")
 LIST(GET PARAVIEW_INCLUDE_DIRS 0 PARAVIEW_INCLUDE_DIR0)
 EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/getwrapclasses.py ${PARAVIEW_INCLUDE_DIR0}
     RESULT_VARIABLE _res)
@@ -148,11 +147,10 @@ ENDIF(CMAKE_BUILD_TYPE)
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/PARAVIS_version.h DESTINATION include/salome)
 
 # Configure Testing
-SET(PARAVIS_TEST_OUTPUT_DIR /tmp/pic CACHE PATH "Directory for saving test pictures.")
 OPTION(BUILD_TESTING "Build ParaVis Testing" ON)
 IF(BUILD_TESTING)
    SET(PARAVIS_TEST_DIR ${ParaVis_BINARY_DIR}/Test/Temporary)
-   MAKE_DIRECTORY(${PARAVIS_TEST_DIR})
+   MAKE_DIRECTORY(${PARAVIS_TEST_DIR})  # TODO: replace with FILE(MAKE_DIRECTORY ...)
    ENABLE_TESTING()
    INCLUDE (CTest)
    ADD_SUBDIRECTORY(test)