Skip to content
Snippets Groups Projects
Verified Commit 6e850f12 authored by Tobias Triffterer's avatar Tobias Triffterer :house_with_garden:
Browse files

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.
parent 88fb7499
No related branches found
No related tags found
No related merge requests found
Pipeline #3073 passed with stage
in 21 seconds
...@@ -99,8 +99,8 @@ set_property(TARGET fp311online PROPERTY POSITION_INDEPENDENT_CODE ON) ...@@ -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 CXX_VISIBILITY_PRESET hidden)
set_property(TARGET fp311online PROPERTY VISIBILITY_INLINES_HIDDEN ON) 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 # The interface of RooDataHist was improved in ROOT 6.24 and the old way of
# querying the content of a bin was deprecated. # querying the content of a bin was deprecated.
target_compile_definitions(fp311online PUBLIC ROOT_6_24_OR_NEWER) 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)
...@@ -96,10 +96,11 @@ AddRootLibraryTarget(LIBNAME RooFit DEPENDENCIES Core RooFitCore Tree RIO Matrix ...@@ -96,10 +96,11 @@ AddRootLibraryTarget(LIBNAME RooFit DEPENDENCIES Core RooFitCore Tree RIO Matrix
include(GNUInstallDirs) include(GNUInstallDirs)
install(DIRECTORY "${PROJECT_BINARY_DIR}/root_install/bin/" TYPE BIN 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/" TYPE LIB 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/" TYPE SYSCONF 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/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/fonts/" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/fonts/truetype/")
install(DIRECTORY "${PROJECT_BINARY_DIR}/root_install/man/" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/man/") 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/") install(FILES "${PROJECT_BINARY_DIR}/root_install/LICENSE" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/root/")
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment