From 1bf3bcfadb9113daf62f4c5a61da5897f2721205 Mon Sep 17 00:00:00 2001 From: vsr Date: Tue, 6 Aug 2013 09:04:01 +0000 Subject: [PATCH] Fix problem with detecting qhelpgenerator (native one is detected) --- CMakeLists.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index ae3bbc39..46bcb049 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,6 +58,14 @@ 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) -- 2.39.2