From 6e850f1227d2aa92f634ebdc617be8dbcd0a7fa3 Mon Sep 17 00:00:00 2001
From: Tobias Triffterer <tobias@ep1.ruhr-uni-bochum.de>
Date: Thu, 29 Apr 2021 16:51:38 +0200
Subject: [PATCH] Fix Issues with older CMake Versions
CMake 3.13 used on my EP1 machine did not like some of the options in
the files, so for compatibility reasons older ones are used.
---
CMakeLists.txt | 4 ++--
cmake/build-root-submodule.cmake | 7 ++++---
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e972c6c..13066b8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -99,8 +99,8 @@ set_property(TARGET fp311online PROPERTY POSITION_INDEPENDENT_CODE ON)
set_property(TARGET fp311online PROPERTY CXX_VISIBILITY_PRESET hidden)
set_property(TARGET fp311online PROPERTY VISIBILITY_INLINES_HIDDEN ON)
-if (${ROOT_VERSION} VERSION_GREATER_EQUAL 6.24)
+if ("${ROOT_MAJOR_VERSION}.${ROOT_MINOR_VERSION}" VERSION_GREATER_EQUAL 6.24)
# The interface of RooDataHist was improved in ROOT 6.24 and the old way of
# querying the content of a bin was deprecated.
target_compile_definitions(fp311online PUBLIC ROOT_6_24_OR_NEWER)
-endif (${ROOT_VERSION} VERSION_GREATER_EQUAL 6.24)
+endif ("${ROOT_MAJOR_VERSION}.${ROOT_MINOR_VERSION}" VERSION_GREATER_EQUAL 6.24)
diff --git a/cmake/build-root-submodule.cmake b/cmake/build-root-submodule.cmake
index 6364bbc..36f05e7 100644
--- a/cmake/build-root-submodule.cmake
+++ b/cmake/build-root-submodule.cmake
@@ -96,10 +96,11 @@ AddRootLibraryTarget(LIBNAME RooFit DEPENDENCIES Core RooFitCore Tree RIO Matrix
include(GNUInstallDirs)
-install(DIRECTORY "${PROJECT_BINARY_DIR}/root_install/bin/" TYPE BIN USE_SOURCE_PERMISSIONS)
-install(DIRECTORY "${PROJECT_BINARY_DIR}/root_install/lib/" TYPE LIB USE_SOURCE_PERMISSIONS)
-install(DIRECTORY "${PROJECT_BINARY_DIR}/root_install/etc/" TYPE SYSCONF USE_SOURCE_PERMISSIONS)
+install(DIRECTORY "${PROJECT_BINARY_DIR}/root_install/bin/" DESTINATION "${CMAKE_INSTALL_BINDIR}" USE_SOURCE_PERMISSIONS)
+install(DIRECTORY "${PROJECT_BINARY_DIR}/root_install/lib/" DESTINATION "${CMAKE_INSTALL_LIBDIR}" USE_SOURCE_PERMISSIONS)
+install(DIRECTORY "${PROJECT_BINARY_DIR}/root_install/etc/" DESTINATION "{CMAKE_INSTALL_SYSCONFDIR}" USE_SOURCE_PERMISSIONS)
install(DIRECTORY "${PROJECT_BINARY_DIR}/root_install/include/" DESTINATION "${CMAKE_INSTALL_PREFIX}/include/root")
install(DIRECTORY "${PROJECT_BINARY_DIR}/root_install/fonts/" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/fonts/truetype/")
install(DIRECTORY "${PROJECT_BINARY_DIR}/root_install/man/" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/man/")
install(FILES "${PROJECT_BINARY_DIR}/root_install/LICENSE" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/root/")
+
--
GitLab