Changeset 19757 for trunk

Timestamp:

10/11/19 09:35:19 (5 years ago)

Author:

tbretz

Message:

Changed the strategy how root finds GQt (if available at all) and minor improvements to the output.

File:

• trunk/FACT++/CMakeLists.txt (modified) (3 diffs)

trunk/FACT++/CMakeLists.txt

@@ -227 +227 @@
       LIST(APPEND CMAKE_PREFIX_PATH $ENV{ROOTSYS})
    ENDIF()
-ELSE()
-   SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "$ENV{ROOTSYS}/etc/cmake")
-ENDIF()
+ENDIF()
+SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "$ENV{ROOTSYS}/etc/cmake")
 
 #---Locate the ROOT package and defines a number of variables (e.g. ROOT_INCLUDE_DIRS)
 IF (NOT TOOLS_ONLY AND NOT VIEWER_ONLY)
-   FIND_PACKAGE(ROOT REQUIRED COMPONENTS GQt)
-ELSE()
-   FIND_PACKAGE(ROOT REQUIRED COMPONENTS)
-ENDIF()
-
-#---Locate the ROOT package and defines a number of variables (e.g. ROOT_INCLUDE_DIRS)
+#   SET(ROOT_CONFIG_DEBUG 1)
+   FIND_PACKAGE(ROOT OPTIONAL_COMPONENTS GQt)
+ENDIF()
+
 IF(NOT DEFINED ROOT_CONFIG_EXECUTABLE)
-   FIND_PACKAGE_MESSAGE(RootFound "Found ROOT: ${ROOT_INCLUDE_DIRS} [${ROOT_VERSION}]" "[${ROOT_INCLUDE_DIRS}][${ROOT_LIBRARY_DIR}][${ROOT_VERSION}]")
+   FIND_PACKAGE_MESSAGE(RootFound "Found ROOT: ${ROOT_INCLUDE_DIRS}" "[${ROOT_INCLUDE_DIRS}][${ROOT_LIBRARY_DIR}][${ROOT_VERSION}]")
+ENDIF()
+
+IF (NOT TOOLS_ONLY AND NOT VIEWER_ONLY AND NOT ROOT_GQt_LIBRARY)
+   IF(ROOT_VERSION VERSION_LESS 6.18)
+      MESSAGE(FATAL_ERROR "Root version [${ROOT_VERSION}] less than 6.18, but component GQt not found.")
+   ELSE()
+      MESSAGE(WARNING "Root version [${ROOT_VERSION}] does not support GQt, GUI [fact] turned off.")
+   ENDIF()
 ENDIF()
 
 #---Define useful ROOT functions and macros (e.g. ROOT_GENERATE_DICTIONARY)
+FIND_PACKAGE_MESSAGE(RootInclude "Setup ROOT: [${ROOT_VERSION}] ${ROOT_USE_FILE}" "[${ROOT_VERSION}][${ROOT_USE_FILE}]")
 IF(DEFINED ROOT_USE_FILE)
-   FIND_PACKAGE_MESSAGE(RootInclude "Setup ROOT: ${ROOT_USE_FILE}" "[${ROOT_USE_FILE}]")
    INCLUDE(${ROOT_USE_FILE})
 ELSE()
-   FIND_PACKAGE_MESSAGE(RootInclude "Setup ROOT: ${ROOT_VERSION}" "[${ROOT_VERSION}]")
    # From RootUseFile.cmake (root 6)
    INCLUDE_DIRECTORIES(${ROOT_INCLUDE_DIRS})
@@ -836 +840 @@
 # --------------------------------------------------------
 
-IF(NOT TOOLS_ONLY AND NOT VIEWER_ONLY)
+IF(NOT TOOLS_ONLY AND NOT VIEWER_ONLY AND ROOT_GQt_FOUND)
 
 QT4_ADD_RESOURCES(FACT_QT_RESOURCES gui/design.qrc)
@@ -881 +885 @@
 #test_LDADD = libStateMachine.la libTools.la libTime.la libDim++.la libDim.la libConfiguration.la
 
-ENDIF(NOT TOOLS_ONLY AND NOT VIEWER_ONLY)
+ENDIF(NOT TOOLS_ONLY AND NOT VIEWER_ONLY AND ROOT_GQt_FOUND)