Skip to content
Snippets Groups Projects
Commit b2279877 authored by Administrator's avatar Administrator Committed by Florian Uhlig
Browse files

Remove usage of ROOTSYS environment variable

Update NicaFemto version which include now all patches.
parent ec931b08
No related branches found
No related tags found
1 merge request!1033Remove usage of ROOTSYS environment variable
Pipeline #20184 passed
......@@ -75,7 +75,6 @@ unset(packages)
find_package(ROOT 6.22 CONFIG REQUIRED)
if(ROOT_FOUND)
list(APPEND packages ROOT)
# The following CMake variables are needed until the modernization is done
endif()
find_package(FairCMakeModules REQUIRED)
......
......@@ -31,8 +31,7 @@ ExternalProject_Add(ANALYSISTREE
-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
-DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}
-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
-DROOTSYS=${SIMPATH}
-DBOOST_ROOT=${SIMPATH}
-DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
-DBoost_NO_BOOST_CMAKE=ON
-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install
......
......@@ -31,9 +31,7 @@ ExternalProject_Add(ANALYSISTREEQA
-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
-DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}
-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
-DROOTSYS=${SIMPATH}
-DBOOST_ROOT=${SIMPATH}
-DBoost_NO_BOOST_CMAKE=ON
-DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
-DAnalysisTreeQA_BUNDLED_AT=OFF
-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install
......
......@@ -48,7 +48,7 @@ ExternalProject_Add(KFPARTICLE
-DVc_INCLUDE_DIR=${Vc_INCLUDE_DIR}
-DVc_LIBRARIES=${Vc_LIBRARY}
-DFIXTARGET=TRUE
-DROOTSYS=${SIMPATH}
-DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install
)
......
set(NICAFEMTO_VERSION 0350ba6a6c4548d5a5b880d8698c25446525723c)
set(NICAFEMTO_VERSION 402c08b17cb62d92575695d74d36dc4750b7562f)
set(NICAFEMTO_SRC_URL "https://git.cbm.gsi.de/f.uhlig/nicafemto.git")
set(NICAFEMTO_DESTDIR "${CMAKE_BINARY_DIR}/external/NICAFEMTO-prefix")
......@@ -13,7 +13,6 @@ download_project_if_needed(PROJECT NicaFemto_source
GIT_REPOSITORY ${NICAFEMTO_SRC_URL}
GIT_TAG ${NICAFEMTO_VERSION}
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/NicaFemto
PATCH_COMMAND "patch -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/NicaFemto.patch"
)
If(ProjectUpdated)
......@@ -42,7 +41,8 @@ ExternalProject_Add(NICAFEMTO
-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
-DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}
-DROOTSYS=${SIMPATH}
-DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
-DCMAKE_MODULE_PATH=${CMAKE_SOURCE_DIR}/cmake/modules
-DJSROOT=${CMAKE_CURRENT_SOURCE_DIR}
-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
"${EXTRA_ARGS}"
......
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