Fix RootMacros include path

BioDynaMo · Aug 14, 2024 · 55e2592 · 55e2592
1 parent 6a2743a
commit 55e2592
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -504,7 +504,7 @@ file(COPY ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/launcher.sh
         GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 
 # -------------------- includes -----------------------------------------------
-include(${CMAKE_INSTALL_CMAKEDIR}/RootMacros.cmake)
+include(RootMacros)
 include(BioDynaMo)
 include(ExternalProject)
 include(Documentation)

diff --git a/cmake/UseBioDynaMo.cmake.in b/cmake/UseBioDynaMo.cmake.in
@@ -332,6 +332,7 @@ endfunction(bdm_add_test)
 
 # -------------------- includes -----------------------------------------------
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${BDMSYS}/share/cmake")
+include("${BDMSYS}/share/cmake/RootMacros.cmake")
 include("${BDMSYS}/share/cmake/BioDynaMo.cmake")
 include(${ROOT_USE_FILE})
 

diff --git a/cmake/utils.cmake b/cmake/utils.cmake
@@ -268,12 +268,12 @@ function(install_inside_build)
     # Copy some cmake files
     add_copy_files(copy_files_bdm
             DESTINATION ${CMAKE_INSTALL_CMAKEDATADIR}
+            ${CMAKE_SOURCE_DIR}/cmake/RootMacros.cmake
             ${CMAKE_SOURCE_DIR}/cmake/BioDynaMoConfig.cmake
             ${CMAKE_SOURCE_DIR}/cmake/BioDynaMo.cmake
             ${CMAKE_SOURCE_DIR}/cmake/SetCompilerFlags.cmake
             ${CMAKE_SOURCE_DIR}/cmake/FindLibroadrunner.cmake
             ${CMAKE_SOURCE_DIR}/cmake/FindROOT.cmake
-            ${CMAKE_SOURCE_DIR}/cmake/RootMacros.cmake
             ${CMAKE_SOURCE_DIR}/cmake/FindVTune.cmake
             ${CMAKE_SOURCE_DIR}/cmake/FindOpenCL.cmake
             ${CMAKE_SOURCE_DIR}/cmake/FindNuma.cmake