File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 5050 set (cmake_args -DJSON_BuildTests=OFF )
5151 if (NOT DEFINED CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT
5252 OR NOT ${CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT} )
53- list (APPEND cmake_args -DCMAKE_INSTALL_PREFIX=${openPMD_INSTALL_PREFIX} )
53+ cmake_path (
54+ ABSOLUTE_PATH openPMD_INSTALL_PREFIX
55+ BASE_DIRECTORY "${openPMD_BINARY_DIR} "
56+ OUTPUT_VARIABLE openPMD_resolved_install_prefix )
57+ list (APPEND cmake_args -DCMAKE_INSTALL_PREFIX=${openPMD_resolved_install_prefix} )
5458 endif ()
5559 ExternalProject_Add (fetchednlohmann_json
5660 SOURCE_DIR ${openPMD_used_json_src}
Original file line number Diff line number Diff line change @@ -56,10 +56,14 @@ function(find_toml11)
5656 include (ExternalProject )
5757 set (cmake_args "" )
5858 if (NOT DEFINED CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT OR NOT ${CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT} )
59- list (APPEND cmake_args -DCMAKE_INSTALL_PREFIX=${openPMD_INSTALL_PREFIX} )
59+ cmake_path (
60+ ABSOLUTE_PATH openPMD_INSTALL_PREFIX
61+ BASE_DIRECTORY "${openPMD_BINARY_DIR} "
62+ OUTPUT_VARIABLE openPMD_resolved_install_prefix )
63+ list (APPEND cmake_args -DCMAKE_INSTALL_PREFIX=${openPMD_resolved_install_prefix} )
6064 endif ()
6165 ExternalProject_Add (fetchedtoml11
62- SOURCE_DIR _deps/fetchedtoml11-src
66+ SOURCE_DIR ${openPMD_used_toml11_src}
6367 BUILD_IN_SOURCE OFF
6468 EXCLUDE_FROM_ALL TRUE
6569 CMAKE_ARGS ${cmake_args}
You can’t perform that action at this time.
0 commit comments