Commit dd1f0962 authored by Ben Boeckel's avatar Ben Boeckel

cmake: allow overriding of the build-tree CMake location

parent 74bd01b4
...@@ -46,7 +46,7 @@ set(VTKm_VERSION_FULL "@VTKm_VERSION_FULL@") ...@@ -46,7 +46,7 @@ set(VTKm_VERSION_FULL "@VTKm_VERSION_FULL@")
set(VTKm_VERSION "@VTKm_VERSION@") set(VTKm_VERSION "@VTKm_VERSION@")
# This is true when the package is still in the build directory (not installed) # This is true when the package is still in the build directory (not installed)
if(CMAKE_CURRENT_LIST_DIR STREQUAL "@VTKm_BINARY_DIR@/@VTKm_INSTALL_CONFIG_DIR@") if(CMAKE_CURRENT_LIST_DIR STREQUAL "@VTKm_BUILD_CMAKE_BASE_DIR@/@VTKm_INSTALL_CONFIG_DIR@")
set(VTKm_PACKAGE_IN_BUILD TRUE) set(VTKm_PACKAGE_IN_BUILD TRUE)
endif() endif()
......
...@@ -277,9 +277,13 @@ set(VTKm_LOAD_COMPONENTS_COMMANDS "${VTKm_LOAD_COMPONENTS_COMMANDS} ...@@ -277,9 +277,13 @@ set(VTKm_LOAD_COMPONENTS_COMMANDS "${VTKm_LOAD_COMPONENTS_COMMANDS}
endif() endif()
endforeach()" ) endforeach()" )
if (NOT DEFINED VTKm_BUILD_CMAKE_BASE_DIR)
set(VTKm_BUILD_CMAKE_BASE_DIR "${VTKm_BINARY_DIR}")
endif ()
configure_package_config_file( configure_package_config_file(
${VTKm_SOURCE_DIR}/CMake/VTKmConfig.cmake.in ${VTKm_SOURCE_DIR}/CMake/VTKmConfig.cmake.in
${VTKm_BINARY_DIR}/${VTKm_INSTALL_CONFIG_DIR}/VTKmConfig.cmake ${VTKm_BUILD_CMAKE_BASE_DIR}/${VTKm_INSTALL_CONFIG_DIR}/VTKmConfig.cmake
INSTALL_DESTINATION ${VTKm_INSTALL_CONFIG_DIR} INSTALL_DESTINATION ${VTKm_INSTALL_CONFIG_DIR}
PATH_VARS PATH_VARS
VTKm_INSTALL_INCLUDE_DIR VTKm_INSTALL_INCLUDE_DIR
...@@ -290,13 +294,13 @@ configure_package_config_file( ...@@ -290,13 +294,13 @@ configure_package_config_file(
) )
write_basic_package_version_file( write_basic_package_version_file(
${VTKm_BINARY_DIR}/${VTKm_INSTALL_CONFIG_DIR}/VTKmConfigVersion.cmake ${VTKm_BUILD_CMAKE_BASE_DIR}/${VTKm_INSTALL_CONFIG_DIR}/VTKmConfigVersion.cmake
VERSION ${VTKm_VERSION} VERSION ${VTKm_VERSION}
COMPATIBILITY ExactVersion ) COMPATIBILITY ExactVersion )
install( install(
FILES FILES
${VTKm_BINARY_DIR}/${VTKm_INSTALL_CONFIG_DIR}/VTKmConfig.cmake ${VTKm_BUILD_CMAKE_BASE_DIR}/${VTKm_INSTALL_CONFIG_DIR}/VTKmConfig.cmake
${VTKm_BINARY_DIR}/${VTKm_INSTALL_CONFIG_DIR}/VTKmConfigVersion.cmake ${VTKm_BUILD_CMAKE_BASE_DIR}/${VTKm_INSTALL_CONFIG_DIR}/VTKmConfigVersion.cmake
DESTINATION ${VTKm_INSTALL_CONFIG_DIR} DESTINATION ${VTKm_INSTALL_CONFIG_DIR}
) )
...@@ -335,7 +339,7 @@ install( ...@@ -335,7 +339,7 @@ install(
# Create and install exports for external projects # Create and install exports for external projects
export(EXPORT ${VTKm_EXPORT_NAME} export(EXPORT ${VTKm_EXPORT_NAME}
FILE ${VTKm_BINARY_DIR}/${VTKm_INSTALL_CONFIG_DIR}/VTKmTargets.cmake FILE ${VTKm_BUILD_CMAKE_BASE_DIR}/${VTKm_INSTALL_CONFIG_DIR}/VTKmTargets.cmake
) )
install(EXPORT ${VTKm_EXPORT_NAME} install(EXPORT ${VTKm_EXPORT_NAME}
DESTINATION ${VTKm_INSTALL_CONFIG_DIR} DESTINATION ${VTKm_INSTALL_CONFIG_DIR}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment