diff options
| author | Brad King <brad.king@kitware.com> | 2021-03-02 13:45:08 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-03-02 13:45:14 (GMT) |
| commit | f95796642b1f2f5004f73be326b16538cec5b5a2 (patch) | |
| tree | 6522166ce283eaa73f58fbe1e9aa5656d6402643 | |
| parent | c829b6179c318c775691974733f2ecbcafa0e502 (diff) | |
| parent | 74c2ade18725757d4e224422eb36168920b95579 (diff) | |
| download | CMake-f95796642b1f2f5004f73be326b16538cec5b5a2.zip CMake-f95796642b1f2f5004f73be326b16538cec5b5a2.tar.gz CMake-f95796642b1f2f5004f73be326b16538cec5b5a2.tar.bz2 | |
Merge topic 'more-import-export-guide-updates' into release-3.20
74c2ade187 Help/guide: fix the remaining CMake install destinations
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5870
3 files changed, 4 insertions, 4 deletions
diff --git a/Help/guide/importing-exporting/MathFunctionsComponents/Addition/CMakeLists.txt b/Help/guide/importing-exporting/MathFunctionsComponents/Addition/CMakeLists.txt index e3cf711..17ad952 100644 --- a/Help/guide/importing-exporting/MathFunctionsComponents/Addition/CMakeLists.txt +++ b/Help/guide/importing-exporting/MathFunctionsComponents/Addition/CMakeLists.txt @@ -26,5 +26,5 @@ install(FILES Addition.h DESTINATION include) install(EXPORT AdditionTargets FILE MathFunctionsAdditionTargets.cmake NAMESPACE MathFunctions:: - DESTINATION lib/cmake + DESTINATION lib/cmake/MathFunctions ) diff --git a/Help/guide/importing-exporting/MathFunctionsComponents/CMakeLists.txt b/Help/guide/importing-exporting/MathFunctionsComponents/CMakeLists.txt index 4e3496d..fd95e28 100644 --- a/Help/guide/importing-exporting/MathFunctionsComponents/CMakeLists.txt +++ b/Help/guide/importing-exporting/MathFunctionsComponents/CMakeLists.txt @@ -24,7 +24,7 @@ write_basic_package_version_file( # create config file configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/Config.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/MathFunctionsConfig.cmake" - INSTALL_DESTINATION lib/cmake + INSTALL_DESTINATION lib/cmake/MathFunctions NO_CHECK_REQUIRED_COMPONENTS_MACRO ) @@ -32,5 +32,5 @@ configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/Config.cmake.in install(FILES "${CMAKE_CURRENT_BINARY_DIR}/MathFunctionsConfig.cmake" "${CMAKE_CURRENT_BINARY_DIR}/MathFunctionsConfigVersion.cmake" - DESTINATION lib/cmake + DESTINATION lib/cmake/MathFunctions ) diff --git a/Help/guide/importing-exporting/MathFunctionsComponents/SquareRoot/CMakeLists.txt b/Help/guide/importing-exporting/MathFunctionsComponents/SquareRoot/CMakeLists.txt index ffa1e3d..be5ae65 100644 --- a/Help/guide/importing-exporting/MathFunctionsComponents/SquareRoot/CMakeLists.txt +++ b/Help/guide/importing-exporting/MathFunctionsComponents/SquareRoot/CMakeLists.txt @@ -26,5 +26,5 @@ install(FILES SquareRoot.h DESTINATION include) install(EXPORT SquareRootTargets FILE MathFunctionsSquareRootTargets.cmake NAMESPACE MathFunctions:: - DESTINATION lib/cmake + DESTINATION lib/cmake/MathFunctions ) |