diff options
| author | Brad King <brad.king@kitware.com> | 2018-04-03 13:38:15 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-04-03 13:38:41 (GMT) |
| commit | 561238bb6f07a5ab31293928bd98f6f8911d8bc1 (patch) | |
| tree | 355a4b35a6f25b23ce4ac72817e53ddbb4caf50b | |
| parent | a01caf81a69ba53d04abee97c7aa277d4762ac27 (diff) | |
| parent | d6883801cd51953a846f8d2323076b3bf58852b1 (diff) | |
| download | CMake-561238bb6f07a5ab31293928bd98f6f8911d8bc1.zip CMake-561238bb6f07a5ab31293928bd98f6f8911d8bc1.tar.gz CMake-561238bb6f07a5ab31293928bd98f6f8911d8bc1.tar.bz2 | |
Merge topic 'FPHSA-include'
d6883801cd Find*: always include FPHSA shipped with CMake
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1910
| -rw-r--r-- | Modules/FindDCMTK.cmake | 2 | ||||
| -rw-r--r-- | Modules/FindMatlab.cmake | 2 | ||||
| -rw-r--r-- | Modules/FindVulkan.cmake | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Modules/FindDCMTK.cmake b/Modules/FindDCMTK.cmake index cc07e26..39c1a5b 100644 --- a/Modules/FindDCMTK.cmake +++ b/Modules/FindDCMTK.cmake @@ -301,7 +301,7 @@ endif() # Compatibility: This variable is deprecated set(DCMTK_INCLUDE_DIR ${DCMTK_INCLUDE_DIRS}) -include(FindPackageHandleStandardArgs) +include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) find_package_handle_standard_args(DCMTK REQUIRED_VARS ${DCMTK_INCLUDE_DIR_NAMES} DCMTK_LIBRARIES FAIL_MESSAGE "Please set DCMTK_DIR and re-run configure") diff --git a/Modules/FindMatlab.cmake b/Modules/FindMatlab.cmake index 8402b23..33b755a 100644 --- a/Modules/FindMatlab.cmake +++ b/Modules/FindMatlab.cmake @@ -213,7 +213,7 @@ set(_FindMatlab_SELF_DIR "${CMAKE_CURRENT_LIST_DIR}") -include(FindPackageHandleStandardArgs) +include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) include(CheckCXXCompilerFlag) include(CheckCCompilerFlag) diff --git a/Modules/FindVulkan.cmake b/Modules/FindVulkan.cmake index 1f4c8ad..4c60ed7 100644 --- a/Modules/FindVulkan.cmake +++ b/Modules/FindVulkan.cmake @@ -65,7 +65,7 @@ endif() set(Vulkan_LIBRARIES ${Vulkan_LIBRARY}) set(Vulkan_INCLUDE_DIRS ${Vulkan_INCLUDE_DIR}) -include(FindPackageHandleStandardArgs) +include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) find_package_handle_standard_args(Vulkan DEFAULT_MSG Vulkan_LIBRARY Vulkan_INCLUDE_DIR) |