diff options
| author | Brad King <brad.king@kitware.com> | 2014-10-03 19:10:18 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-10-03 19:10:18 (GMT) |
| commit | 0dd07f1dfebee5ed17d41bf439187a37c1a1f378 (patch) | |
| tree | e10a6b430008acaea71b5ece7e84b4f3c8a922d4 /Modules | |
| parent | 87eb1ed20b73b6021c6b9c40e43d3e19ea7b4669 (diff) | |
| parent | 3670c6a41c9a8f09afd6230b99389d186c348c3e (diff) | |
| download | CMake-0dd07f1dfebee5ed17d41bf439187a37c1a1f378.zip CMake-0dd07f1dfebee5ed17d41bf439187a37c1a1f378.tar.gz CMake-0dd07f1dfebee5ed17d41bf439187a37c1a1f378.tar.bz2 | |
Merge topic 'FPHSA-include'
3670c6a4 fix inclusion of FPHSA
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindBacktrace.cmake | 2 | ||||
| -rw-r--r-- | Modules/FindIce.cmake | 2 | ||||
| -rw-r--r-- | Modules/FindSquish.cmake | 2 | ||||
| -rw-r--r-- | Modules/FindXerces.cmake | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/Modules/FindBacktrace.cmake b/Modules/FindBacktrace.cmake index 5620661..07109b0 100644 --- a/Modules/FindBacktrace.cmake +++ b/Modules/FindBacktrace.cmake @@ -44,7 +44,7 @@ include(CMakePushCheckState) include(CheckSymbolExists) -include(FindPackageHandleStandardArgs) +include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) # List of variables to be provided to find_package_handle_standard_args() set(_Backtrace_STD_ARGS Backtrace_INCLUDE_DIR) diff --git a/Modules/FindIce.cmake b/Modules/FindIce.cmake index 60a4107..55528b8 100644 --- a/Modules/FindIce.cmake +++ b/Modules/FindIce.cmake @@ -334,7 +334,7 @@ endfunction() _Ice_FIND() -include(FindPackageHandleStandardArgs) +include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) FIND_PACKAGE_HANDLE_STANDARD_ARGS(Ice FOUND_VAR Ice_FOUND REQUIRED_VARS Ice_SLICE2CPP_EXECUTABLE diff --git a/Modules/FindSquish.cmake b/Modules/FindSquish.cmake index 4076521..2b7fd22 100644 --- a/Modules/FindSquish.cmake +++ b/Modules/FindSquish.cmake @@ -201,7 +201,7 @@ else() endif() # record if Squish was found -include(FindPackageHandleStandardArgs) +include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) find_package_handle_standard_args(Squish REQUIRED_VARS SQUISH_INSTALL_DIR SQUISH_CLIENT_EXECUTABLE SQUISH_SERVER_EXECUTABLE VERSION_VAR SQUISH_VERSION ) diff --git a/Modules/FindXerces.cmake b/Modules/FindXerces.cmake index 325bb6d..6c6007a 100644 --- a/Modules/FindXerces.cmake +++ b/Modules/FindXerces.cmake @@ -70,7 +70,7 @@ if(Xerces_INCLUDE_DIR) _Xerces_GET_VERSION("${Xerces_INCLUDE_DIR}/xercesc/util/XercesVersion.hpp") endif() -include(FindPackageHandleStandardArgs) +include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) FIND_PACKAGE_HANDLE_STANDARD_ARGS(Xerces FOUND_VAR Xerces_FOUND REQUIRED_VARS Xerces_LIBRARY |