File tree 2 files changed +11
-3
lines changed
2 files changed +11
-3
lines changed Original file line number Diff line number Diff line change 50
50
set (cmake_args -DJSON_BuildTests=OFF )
51
51
if (NOT DEFINED CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT
52
52
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} )
54
58
endif ()
55
59
ExternalProject_Add(fetchednlohmann_json
56
60
SOURCE_DIR ${openPMD_used_json_src}
Original file line number Diff line number Diff line change @@ -56,10 +56,14 @@ function(find_toml11)
56
56
include (ExternalProject)
57
57
set (cmake_args "" )
58
58
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} )
60
64
endif ()
61
65
ExternalProject_Add(fetchedtoml11
62
- SOURCE_DIR _deps/fetchedtoml11-src
66
+ SOURCE_DIR ${openPMD_used_toml11_src}
63
67
BUILD_IN_SOURCE OFF
64
68
EXCLUDE_FROM_ALL TRUE
65
69
CMAKE_ARGS ${cmake_args}
You can’t perform that action at this time.
0 commit comments