Changeset 19756 for trunk/Mars

Timestamp:

10/11/19 09:33:21 (5 years ago)

Author:

tbretz

Message:

Some minor improvements to root detection output. If a root build directory is used, the pcm files are not at the right location -> create links.

File:

• trunk/Mars/CMakeLists.txt (modified) (4 diffs)

trunk/Mars/CMakeLists.txt

@@ -129 +129 @@
 
 #---Locate the ROOT package and defines a number of variables (e.g. ROOT_INCLUDE_DIRS)
+#SET(ROOT_CONFIG_DEBUG 1)
 FIND_PACKAGE(ROOT REQUIRED COMPONENTS ${ROOT_PACKAGES})
 
 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()
 
 #---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})
@@ -149 +149 @@
    SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} ${ROOT_fortran_FLAGS}")
 ENDIF()
+
 
 # -lGui -lCore -lCint -lRIO -lNet -lHist -lGraf -lGraf3d -lGpad -lTree
@@ -240 +241 @@
 
         INSTALL(DIRECTORY ${subdir}/ DESTINATION "include" FILES_MATCHING PATTERN "*.h")
+
+        # This is a hack if somebody tries to run root from
+        # the compile directory rather than from a package
+        # install directory. In this case, the pcm files
+        # are not where the library is where they should be
+        ADD_CUSTOM_COMMAND(
+            OUTPUT  lib/${_CINT}_rdict.pcm
+            COMMAND ln -s ../dictionary/${_CINT}_rdict.pcm ${_CINT}_rdict.pcm
+            WORKING_DIRECTORY lib
+        VERBATIM)
+        ADD_CUSTOM_TARGET(${_CINT}.p ALL DEPENDS lib/${_CINT}_rdict.pcm)
 
 ENDMACRO()
@@ -309 +321 @@
 SET_SOURCE_FILES_PROPERTIES(dictionary/Core.cxx PROPERTIES COMPILE_FLAGS "-Wno-deprecated-register")
 
+# This is a hack if somebody tries to run root from
+# the compile directory rather than from a package
+# install directory. In this case, the pcm files
+# are not where the library is where they should be
+ADD_CUSTOM_COMMAND(
+    OUTPUT  lib/Core_rdict.pcm
+    COMMAND ln -s ../dictionary/Core_rdict.pcm Core_rdict.pcm
+    WORKING_DIRECTORY lib
+VERBATIM)
+ADD_CUSTOM_TARGET(Core.p ALL DEPENDS lib/Core_rdict.pcm)
+
+
 TARGET_LINK_LIBRARIES(mars
         ZLIB::ZLIB