fix inclusion of FPHSA
Make sure these modules also include exactly the version shipped with CMake.
This commit is contained in:
parent
99d34f46fa
commit
3670c6a41c
|
@ -44,7 +44,7 @@
|
||||||
|
|
||||||
include(CMakePushCheckState)
|
include(CMakePushCheckState)
|
||||||
include(CheckSymbolExists)
|
include(CheckSymbolExists)
|
||||||
include(FindPackageHandleStandardArgs)
|
include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
|
||||||
|
|
||||||
# List of variables to be provided to find_package_handle_standard_args()
|
# List of variables to be provided to find_package_handle_standard_args()
|
||||||
set(_Backtrace_STD_ARGS Backtrace_INCLUDE_DIR)
|
set(_Backtrace_STD_ARGS Backtrace_INCLUDE_DIR)
|
||||||
|
|
|
@ -334,7 +334,7 @@ endfunction()
|
||||||
|
|
||||||
_Ice_FIND()
|
_Ice_FIND()
|
||||||
|
|
||||||
include(FindPackageHandleStandardArgs)
|
include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
|
||||||
FIND_PACKAGE_HANDLE_STANDARD_ARGS(Ice
|
FIND_PACKAGE_HANDLE_STANDARD_ARGS(Ice
|
||||||
FOUND_VAR Ice_FOUND
|
FOUND_VAR Ice_FOUND
|
||||||
REQUIRED_VARS Ice_SLICE2CPP_EXECUTABLE
|
REQUIRED_VARS Ice_SLICE2CPP_EXECUTABLE
|
||||||
|
|
|
@ -201,7 +201,7 @@ else()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# record if Squish was found
|
# 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
|
find_package_handle_standard_args(Squish REQUIRED_VARS SQUISH_INSTALL_DIR SQUISH_CLIENT_EXECUTABLE SQUISH_SERVER_EXECUTABLE
|
||||||
VERSION_VAR SQUISH_VERSION )
|
VERSION_VAR SQUISH_VERSION )
|
||||||
|
|
||||||
|
|
|
@ -70,7 +70,7 @@ if(Xerces_INCLUDE_DIR)
|
||||||
_Xerces_GET_VERSION("${Xerces_INCLUDE_DIR}/xercesc/util/XercesVersion.hpp")
|
_Xerces_GET_VERSION("${Xerces_INCLUDE_DIR}/xercesc/util/XercesVersion.hpp")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
include(FindPackageHandleStandardArgs)
|
include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
|
||||||
FIND_PACKAGE_HANDLE_STANDARD_ARGS(Xerces
|
FIND_PACKAGE_HANDLE_STANDARD_ARGS(Xerces
|
||||||
FOUND_VAR Xerces_FOUND
|
FOUND_VAR Xerces_FOUND
|
||||||
REQUIRED_VARS Xerces_LIBRARY
|
REQUIRED_VARS Xerces_LIBRARY
|
||||||
|
|
Loading…
Reference in New Issue