From 7afa58b15d8c36665aec648eee0332d16afb517d Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 29 Jan 2025 15:10:33 -0500 Subject: [PATCH] Modules/Find*: Include FindPackageHandleStandardArgs normally Since commit d74210a8bd (CMP0017: Remove support for OLD behavior, 2024-11-17) we can rely on CMP0017's NEW behavior unconditionally. Calling `include(FindPackageHandleStandardArgs)` in a builtin module will always get the builtin `FindPackageHandleStandardArgs`. --- Modules/FindALSA.cmake | 2 +- Modules/FindASPELL.cmake | 2 +- Modules/FindAVIFile.cmake | 2 +- Modules/FindArmadillo.cmake | 2 +- Modules/FindBISON.cmake | 2 +- Modules/FindBLAS.cmake | 2 +- Modules/FindBZip2.cmake | 2 +- Modules/FindBacktrace.cmake | 2 +- Modules/FindBoost.cmake | 2 +- Modules/FindBullet.cmake | 2 +- Modules/FindCUDA.cmake | 2 +- Modules/FindCUDAToolkit.cmake | 2 +- Modules/FindCURL.cmake | 2 +- Modules/FindCVS.cmake | 2 +- Modules/FindCoin3D.cmake | 2 +- Modules/FindCups.cmake | 2 +- Modules/FindCurses.cmake | 2 +- Modules/FindCxxTest.cmake | 2 +- Modules/FindDCMTK.cmake | 2 +- Modules/FindDart.cmake | 2 +- Modules/FindDevIL.cmake | 2 +- Modules/FindDoxygen.cmake | 2 +- Modules/FindEXPAT.cmake | 2 +- Modules/FindEnvModules.cmake | 2 +- Modules/FindFLEX.cmake | 2 +- Modules/FindFLTK.cmake | 2 +- Modules/FindFreetype.cmake | 2 +- Modules/FindGDAL.cmake | 2 +- Modules/FindGIF.cmake | 2 +- Modules/FindGLEW.cmake | 2 +- Modules/FindGLUT.cmake | 2 +- Modules/FindGSL.cmake | 2 +- Modules/FindGTK2.cmake | 2 +- Modules/FindGTest.cmake | 2 +- Modules/FindGettext.cmake | 2 +- Modules/FindGit.cmake | 2 +- Modules/FindGnuTLS.cmake | 2 +- Modules/FindGnuplot.cmake | 2 +- Modules/FindHDF5.cmake | 2 +- Modules/FindHSPELL.cmake | 2 +- Modules/FindHg.cmake | 2 +- Modules/FindICU.cmake | 2 +- Modules/FindIce.cmake | 2 +- Modules/FindIconv.cmake | 2 +- Modules/FindIcotool.cmake | 2 +- Modules/FindImageMagick.cmake | 2 +- Modules/FindIntl.cmake | 2 +- Modules/FindJPEG.cmake | 2 +- Modules/FindJasper.cmake | 2 +- Modules/FindJava.cmake | 2 +- Modules/FindLAPACK.cmake | 2 +- Modules/FindLATEX.cmake | 2 +- Modules/FindLTTngUST.cmake | 2 +- Modules/FindLibArchive.cmake | 2 +- Modules/FindLibLZMA.cmake | 2 +- Modules/FindLibXml2.cmake | 2 +- Modules/FindLibXslt.cmake | 2 +- Modules/FindLua.cmake | 2 +- Modules/FindLua50.cmake | 2 +- Modules/FindLua51.cmake | 2 +- Modules/FindMPEG.cmake | 2 +- Modules/FindMPEG2.cmake | 2 +- Modules/FindMPI.cmake | 2 +- Modules/FindMatlab.cmake | 2 +- Modules/FindMotif.cmake | 2 +- Modules/FindOpenACC.cmake | 2 +- Modules/FindOpenAL.cmake | 2 +- Modules/FindOpenCL.cmake | 2 +- Modules/FindOpenGL.cmake | 2 +- Modules/FindOpenMP.cmake | 2 +- Modules/FindOpenSSL.cmake | 2 +- Modules/FindOpenSceneGraph.cmake | 2 +- Modules/FindOpenThreads.cmake | 2 +- Modules/FindPHP4.cmake | 2 +- Modules/FindPNG.cmake | 2 +- Modules/FindPatch.cmake | 2 +- Modules/FindPerl.cmake | 2 +- Modules/FindPerlLibs.cmake | 2 +- Modules/FindPhysFS.cmake | 2 +- Modules/FindPkgConfig.cmake | 2 +- Modules/FindPostgreSQL.cmake | 2 +- Modules/FindProducer.cmake | 2 +- Modules/FindProtobuf.cmake | 2 +- Modules/FindPython.cmake | 2 +- Modules/FindPython/Support.cmake | 2 +- Modules/FindPythonInterp.cmake | 2 +- Modules/FindPythonLibs.cmake | 2 +- Modules/FindQt3.cmake | 2 +- Modules/FindQt4.cmake | 2 +- Modules/FindQuickTime.cmake | 2 +- Modules/FindRTI.cmake | 2 +- Modules/FindRuby.cmake | 2 +- Modules/FindSDL.cmake | 2 +- Modules/FindSDL_image.cmake | 2 +- Modules/FindSDL_mixer.cmake | 2 +- Modules/FindSDL_net.cmake | 2 +- Modules/FindSDL_sound.cmake | 2 +- Modules/FindSDL_ttf.cmake | 2 +- Modules/FindSQLite3.cmake | 2 +- Modules/FindSWIG.cmake | 2 +- Modules/FindSquish.cmake | 2 +- Modules/FindSubversion.cmake | 2 +- Modules/FindTCL.cmake | 2 +- Modules/FindTIFF.cmake | 4 ++-- Modules/FindTclsh.cmake | 2 +- Modules/FindThreads.cmake | 2 +- Modules/FindUnixCommands.cmake | 2 +- Modules/FindVulkan.cmake | 2 +- Modules/FindWget.cmake | 2 +- Modules/FindX11.cmake | 2 +- Modules/FindXCTest.cmake | 2 +- Modules/FindXMLRPC.cmake | 2 +- Modules/FindXalanC.cmake | 2 +- Modules/FindXercesC.cmake | 2 +- Modules/FindZLIB.cmake | 2 +- Modules/Findosg.cmake | 2 +- Modules/FindosgAnimation.cmake | 2 +- Modules/FindosgDB.cmake | 2 +- Modules/FindosgFX.cmake | 2 +- Modules/FindosgGA.cmake | 2 +- Modules/FindosgIntrospection.cmake | 2 +- Modules/FindosgManipulator.cmake | 2 +- Modules/FindosgParticle.cmake | 2 +- Modules/FindosgPresentation.cmake | 2 +- Modules/FindosgProducer.cmake | 2 +- Modules/FindosgQt.cmake | 2 +- Modules/FindosgShadow.cmake | 2 +- Modules/FindosgSim.cmake | 2 +- Modules/FindosgTerrain.cmake | 2 +- Modules/FindosgText.cmake | 2 +- Modules/FindosgUtil.cmake | 2 +- Modules/FindosgViewer.cmake | 2 +- Modules/FindosgVolume.cmake | 2 +- Modules/FindosgWidget.cmake | 2 +- Modules/FindwxWidgets.cmake | 2 +- 135 files changed, 136 insertions(+), 136 deletions(-) diff --git a/Modules/FindALSA.cmake b/Modules/FindALSA.cmake index 0143b07d6e..f662c64b72 100644 --- a/Modules/FindALSA.cmake +++ b/Modules/FindALSA.cmake @@ -61,7 +61,7 @@ if(ALSA_INCLUDE_DIR AND EXISTS "${ALSA_INCLUDE_DIR}/alsa/version.h") unset(alsa_version_str) endif() -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(ALSA REQUIRED_VARS ALSA_LIBRARY ALSA_INCLUDE_DIR VERSION_VAR ALSA_VERSION_STRING) diff --git a/Modules/FindASPELL.cmake b/Modules/FindASPELL.cmake index c750696300..dd0537e056 100644 --- a/Modules/FindASPELL.cmake +++ b/Modules/FindASPELL.cmake @@ -26,7 +26,7 @@ find_program(ASPELL_EXECUTABLE find_library(ASPELL_LIBRARIES NAMES aspell aspell-15 libaspell-15 libaspell) -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(ASPELL DEFAULT_MSG ASPELL_LIBRARIES ASPELL_INCLUDE_DIR ASPELL_EXECUTABLE) mark_as_advanced(ASPELL_INCLUDE_DIR ASPELL_LIBRARIES ASPELL_EXECUTABLE) diff --git a/Modules/FindAVIFile.cmake b/Modules/FindAVIFile.cmake index 0ab364b051..df96434523 100644 --- a/Modules/FindAVIFile.cmake +++ b/Modules/FindAVIFile.cmake @@ -28,7 +28,7 @@ if (UNIX) endif () -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(AVIFile DEFAULT_MSG AVIFILE_INCLUDE_DIR AVIFILE_AVIPLAY_LIBRARY) if (AVIFILE_FOUND) diff --git a/Modules/FindArmadillo.cmake b/Modules/FindArmadillo.cmake index 4488409950..65d3ed50a5 100644 --- a/Modules/FindArmadillo.cmake +++ b/Modules/FindArmadillo.cmake @@ -81,7 +81,7 @@ if(EXISTS "${ARMADILLO_INCLUDE_DIR}/armadillo_bits/config.hpp") string(REGEX MATCH "ARMA_USE_HDF5" _ARMA_USE_HDF5 "${_ARMA_CONFIG_CONTENTS}") endif() -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) # If _ARMA_USE_WRAPPER is set, then we just link to armadillo, but if it's not then we need support libraries instead set(_ARMA_SUPPORT_LIBRARIES) diff --git a/Modules/FindBISON.cmake b/Modules/FindBISON.cmake index c5f67d75d3..7335238d3a 100644 --- a/Modules/FindBISON.cmake +++ b/Modules/FindBISON.cmake @@ -378,6 +378,6 @@ if(BISON_EXECUTABLE) endif() -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(BISON REQUIRED_VARS BISON_EXECUTABLE VERSION_VAR BISON_VERSION) diff --git a/Modules/FindBLAS.cmake b/Modules/FindBLAS.cmake index 0bbd5a8128..2a20d33718 100644 --- a/Modules/FindBLAS.cmake +++ b/Modules/FindBLAS.cmake @@ -286,7 +286,7 @@ if(CMAKE_Fortran_COMPILER_LOADED) else() include(${CMAKE_CURRENT_LIST_DIR}/CheckFunctionExists.cmake) endif() -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) if(BLA_PREFER_PKGCONFIG) if(NOT BLA_PKGCONFIG_BLAS) diff --git a/Modules/FindBZip2.cmake b/Modules/FindBZip2.cmake index c40db41b69..96eae448e5 100644 --- a/Modules/FindBZip2.cmake +++ b/Modules/FindBZip2.cmake @@ -84,7 +84,7 @@ if (BZIP2_INCLUDE_DIR AND EXISTS "${BZIP2_INCLUDE_DIR}/bzlib.h") set(BZIP2_VERSION ${BZIP2_VERSION_STRING}) endif () -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(BZip2 REQUIRED_VARS BZIP2_LIBRARIES BZIP2_INCLUDE_DIR VERSION_VAR BZIP2_VERSION) diff --git a/Modules/FindBacktrace.cmake b/Modules/FindBacktrace.cmake index b62ea559d5..f5f9a7a41f 100644 --- a/Modules/FindBacktrace.cmake +++ b/Modules/FindBacktrace.cmake @@ -53,7 +53,7 @@ This module defines the following :prop_tgt:`IMPORTED` targets: include(CMakePushCheckState) include(CheckSymbolExists) -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) # List of variables to be provided to find_package_handle_standard_args() set(_Backtrace_STD_ARGS Backtrace_INCLUDE_DIR) diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake index d6647d0d5a..0ae6918287 100644 --- a/Modules/FindBoost.cmake +++ b/Modules/FindBoost.cmake @@ -396,7 +396,7 @@ endif() # The FPHSA helper provides standard way of reporting final search results to # the user including the version and component checks. -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) # Save project's policies cmake_policy(PUSH) diff --git a/Modules/FindBullet.cmake b/Modules/FindBullet.cmake index 712e24520f..9b053480dd 100644 --- a/Modules/FindBullet.cmake +++ b/Modules/FindBullet.cmake @@ -79,7 +79,7 @@ _FIND_BULLET_LIBRARY(BULLET_SOFTBODY_LIBRARY BulletSoftBody) _FIND_BULLET_LIBRARY(BULLET_SOFTBODY_LIBRARY_DEBUG BulletSoftBody_Debug BulletSoftBody_d) -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Bullet DEFAULT_MSG BULLET_DYNAMICS_LIBRARY BULLET_COLLISION_LIBRARY BULLET_MATH_LIBRARY BULLET_SOFTBODY_LIBRARY BULLET_INCLUDE_DIR) diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake index 780da32075..4323fda046 100644 --- a/Modules/FindCUDA.cmake +++ b/Modules/FindCUDA.cmake @@ -1291,7 +1291,7 @@ set(CUDA_TOOLKIT_TARGET_DIR_INTERNAL "${CUDA_TOOLKIT_TARGET_DIR}" CACHE INTERNAL set(CUDA_SDK_ROOT_DIR_INTERNAL "${CUDA_SDK_ROOT_DIR}" CACHE INTERNAL "This is the value of the last time CUDA_SDK_ROOT_DIR was set successfully." FORCE) -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(CUDA REQUIRED_VARS diff --git a/Modules/FindCUDAToolkit.cmake b/Modules/FindCUDAToolkit.cmake index 7a0d0dfa73..220a6debfb 100644 --- a/Modules/FindCUDAToolkit.cmake +++ b/Modules/FindCUDAToolkit.cmake @@ -1054,7 +1054,7 @@ endif() #----------------------------------------------------------------------------- # Perform version comparison and validate all required variables are set. -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(CUDAToolkit REQUIRED_VARS CUDAToolkit_INCLUDE_DIRECTORIES diff --git a/Modules/FindCURL.cmake b/Modules/FindCURL.cmake index 8c2f8f6bfe..9f1d2cd37d 100644 --- a/Modules/FindCURL.cmake +++ b/Modules/FindCURL.cmake @@ -82,7 +82,7 @@ Hints cmake_policy(PUSH) cmake_policy(SET CMP0159 NEW) # file(STRINGS) with REGEX updates CMAKE_MATCH_ -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) if(NOT CURL_NO_CURL_CMAKE) # do a find package call to specifically look for the CMake version diff --git a/Modules/FindCVS.cmake b/Modules/FindCVS.cmake index 1009b78eaf..fb37329c5d 100644 --- a/Modules/FindCVS.cmake +++ b/Modules/FindCVS.cmake @@ -69,5 +69,5 @@ mark_as_advanced(CVS_EXECUTABLE) # Handle the QUIETLY and REQUIRED arguments and set CVS_FOUND to TRUE if # all listed variables are TRUE -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(CVS DEFAULT_MSG CVS_EXECUTABLE) diff --git a/Modules/FindCoin3D.cmake b/Modules/FindCoin3D.cmake index 4be0eef1a5..c6338b1f7e 100644 --- a/Modules/FindCoin3D.cmake +++ b/Modules/FindCoin3D.cmake @@ -71,7 +71,7 @@ else () endif () -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Coin3D DEFAULT_MSG COIN3D_LIBRARIES COIN3D_INCLUDE_DIRS) mark_as_advanced(COIN3D_INCLUDE_DIRS COIN3D_LIBRARIES ) diff --git a/Modules/FindCups.cmake b/Modules/FindCups.cmake index d76697c940..2c79cf48a3 100644 --- a/Modules/FindCups.cmake +++ b/Modules/FindCups.cmake @@ -78,7 +78,7 @@ if (CUPS_INCLUDE_DIR AND EXISTS "${CUPS_INCLUDE_DIR}/cups/cups.h") endforeach() endif () -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) if (CUPS_REQUIRE_IPP_DELETE_ATTRIBUTE) find_package_handle_standard_args(Cups diff --git a/Modules/FindCurses.cmake b/Modules/FindCurses.cmake index 58feccf9c6..d5bb10d129 100644 --- a/Modules/FindCurses.cmake +++ b/Modules/FindCurses.cmake @@ -264,7 +264,7 @@ if(PKG_CONFIG_FOUND) set(CURSES_CFLAGS ${NCURSES_CFLAGS_OTHER}) endif() -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Curses DEFAULT_MSG CURSES_LIBRARY CURSES_INCLUDE_PATH) diff --git a/Modules/FindCxxTest.cmake b/Modules/FindCxxTest.cmake index 6c1fdf4fff..72920828ca 100644 --- a/Modules/FindCxxTest.cmake +++ b/Modules/FindCxxTest.cmake @@ -195,7 +195,7 @@ find_program(CXXTEST_PERL_TESTGEN_EXECUTABLE cxxtestgen.pl PATHS ${CXXTEST_INCLUDE_DIR}) if(PYTHON_FOUND OR PERL_FOUND) - include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) + include(FindPackageHandleStandardArgs) if(PYTHON_FOUND AND (CXXTEST_USE_PYTHON OR NOT PERL_FOUND OR NOT DEFINED CXXTEST_USE_PYTHON)) set(CXXTEST_TESTGEN_EXECUTABLE ${CXXTEST_PYTHON_TESTGEN_EXECUTABLE}) diff --git a/Modules/FindDCMTK.cmake b/Modules/FindDCMTK.cmake index 0154a059a4..5f5267c077 100644 --- a/Modules/FindDCMTK.cmake +++ b/Modules/FindDCMTK.cmake @@ -302,7 +302,7 @@ endif() # Compatibility: This variable is deprecated set(DCMTK_INCLUDE_DIR ${DCMTK_INCLUDE_DIRS}) -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) 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/FindDart.cmake b/Modules/FindDart.cmake index 7b4cefd784..7ee51b9204 100644 --- a/Modules/FindDart.cmake +++ b/Modules/FindDart.cmake @@ -35,7 +35,7 @@ find_path(DART_ROOT README.INSTALL DOC "If you have Dart installed, where is it located?" ) -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Dart DEFAULT_MSG DART_ROOT) mark_as_advanced(DART_ROOT) diff --git a/Modules/FindDevIL.cmake b/Modules/FindDevIL.cmake index 919860b12e..548132225f 100644 --- a/Modules/FindDevIL.cmake +++ b/Modules/FindDevIL.cmake @@ -64,7 +64,7 @@ This module sets: # TODO: Add version support. # Tested under Linux and Windows (MSVC) -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_path(IL_INCLUDE_DIR il.h PATH_SUFFIXES include IL diff --git a/Modules/FindDoxygen.cmake b/Modules/FindDoxygen.cmake index a628c5265c..0920c83865 100644 --- a/Modules/FindDoxygen.cmake +++ b/Modules/FindDoxygen.cmake @@ -433,7 +433,7 @@ endif() # or use something like homebrew. # ============== End OSX stuff ================ -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) # # Find Doxygen... diff --git a/Modules/FindEXPAT.cmake b/Modules/FindEXPAT.cmake index 93a597108f..741689e8d3 100644 --- a/Modules/FindEXPAT.cmake +++ b/Modules/FindEXPAT.cmake @@ -138,7 +138,7 @@ if(EXPAT_INCLUDE_DIR AND EXISTS "${EXPAT_INCLUDE_DIR}/expat.h") endforeach() endif() -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(EXPAT REQUIRED_VARS EXPAT_LIBRARY EXPAT_INCLUDE_DIR VERSION_VAR EXPAT_VERSION_STRING) diff --git a/Modules/FindEnvModules.cmake b/Modules/FindEnvModules.cmake index 2bbf0e5e30..14f8fdf0f2 100644 --- a/Modules/FindEnvModules.cmake +++ b/Modules/FindEnvModules.cmake @@ -328,5 +328,5 @@ find_program(EnvModules_COMMAND PATH_SUFFIXES libexec ) -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(EnvModules DEFAULT_MSG EnvModules_COMMAND) diff --git a/Modules/FindFLEX.cmake b/Modules/FindFLEX.cmake index 19827aa7b8..56b4c350ac 100644 --- a/Modules/FindFLEX.cmake +++ b/Modules/FindFLEX.cmake @@ -339,6 +339,6 @@ if(FLEX_EXECUTABLE) endif() -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(FLEX REQUIRED_VARS FLEX_EXECUTABLE VERSION_VAR FLEX_VERSION) diff --git a/Modules/FindFLTK.cmake b/Modules/FindFLTK.cmake index f234069675..0343caa2b8 100644 --- a/Modules/FindFLTK.cmake +++ b/Modules/FindFLTK.cmake @@ -322,7 +322,7 @@ if(NOT FLTK_SKIP_OPENGL) endif() list(APPEND FLTK_LIBRARIES ${FLTK_BASE_LIBRARY}) -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) if(FLTK_SKIP_FLUID) find_package_handle_standard_args(FLTK DEFAULT_MSG FLTK_LIBRARIES FLTK_INCLUDE_DIR) else() diff --git a/Modules/FindFreetype.cmake b/Modules/FindFreetype.cmake index 6d0ed68128..0f8c931f36 100644 --- a/Modules/FindFreetype.cmake +++ b/Modules/FindFreetype.cmake @@ -160,7 +160,7 @@ if(FREETYPE_INCLUDE_DIR_freetype2 AND FREETYPE_H) endforeach() endif() -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args( Freetype diff --git a/Modules/FindGDAL.cmake b/Modules/FindGDAL.cmake index 739b79c052..58c5735415 100644 --- a/Modules/FindGDAL.cmake +++ b/Modules/FindGDAL.cmake @@ -202,7 +202,7 @@ if (GDAL_FIND_VERSION VERSION_GREATER_EQUAL 3.5) ) endif() -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(GDAL VERSION_VAR GDAL_VERSION REQUIRED_VARS GDAL_LIBRARY GDAL_INCLUDE_DIR) diff --git a/Modules/FindGIF.cmake b/Modules/FindGIF.cmake index aa9432283c..065a24ed8b 100644 --- a/Modules/FindGIF.cmake +++ b/Modules/FindGIF.cmake @@ -108,7 +108,7 @@ if(GIF_INCLUDE_DIR) cmake_pop_check_state() endif() -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(GIF REQUIRED_VARS GIF_LIBRARY GIF_INCLUDE_DIR VERSION_VAR GIF_VERSION ) diff --git a/Modules/FindGLEW.cmake b/Modules/FindGLEW.cmake index f6b7b1a298..59c9b33b5c 100644 --- a/Modules/FindGLEW.cmake +++ b/Modules/FindGLEW.cmake @@ -62,7 +62,7 @@ This module defines the following variables: #]=======================================================================] -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake) find_package(GLEW CONFIG QUIET) diff --git a/Modules/FindGLUT.cmake b/Modules/FindGLUT.cmake index 471e3aaee1..e2fd0a4ad9 100644 --- a/Modules/FindGLUT.cmake +++ b/Modules/FindGLUT.cmake @@ -65,7 +65,7 @@ The following variables may also be provided, for backwards compatibility: #]=======================================================================] include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake) -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package(PkgConfig QUIET) if(PKG_CONFIG_FOUND) diff --git a/Modules/FindGSL.cmake b/Modules/FindGSL.cmake index dc784cdc02..45f88221d0 100644 --- a/Modules/FindGSL.cmake +++ b/Modules/FindGSL.cmake @@ -62,7 +62,7 @@ help this module find the correct files:: cmake_policy(PUSH) cmake_policy(SET CMP0159 NEW) # file(STRINGS) with REGEX updates CMAKE_MATCH_ -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) #============================================================================= # If the user has provided ``GSL_ROOT_DIR``, use it! Choose items found diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake index 2017b0f05f..adb8ef158d 100644 --- a/Modules/FindGTK2.cmake +++ b/Modules/FindGTK2.cmake @@ -915,7 +915,7 @@ endif() set(_GTK2_did_we_find_everything true) # This gets set to GTK2_FOUND -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) foreach(_GTK2_component ${GTK2_FIND_COMPONENTS}) string(TOUPPER ${_GTK2_component} _COMPONENT_UPPER) diff --git a/Modules/FindGTest.cmake b/Modules/FindGTest.cmake index a10357d954..5fad3f2873 100644 --- a/Modules/FindGTest.cmake +++ b/Modules/FindGTest.cmake @@ -191,7 +191,7 @@ endfunction() # -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) # first specifically look for the CMake version of GTest find_package(GTest QUIET NO_MODULE) diff --git a/Modules/FindGettext.cmake b/Modules/FindGettext.cmake index ac7b925dc1..c9937e7f05 100644 --- a/Modules/FindGettext.cmake +++ b/Modules/FindGettext.cmake @@ -77,7 +77,7 @@ if(GETTEXT_MSGMERGE_EXECUTABLE) unset(msgmerge_namewe) endif() -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Gettext REQUIRED_VARS GETTEXT_MSGMERGE_EXECUTABLE GETTEXT_MSGFMT_EXECUTABLE VERSION_VAR GETTEXT_VERSION_STRING) diff --git a/Modules/FindGit.cmake b/Modules/FindGit.cmake index 08a386a74b..87707a9975 100644 --- a/Modules/FindGit.cmake +++ b/Modules/FindGit.cmake @@ -124,7 +124,7 @@ if(GIT_EXECUTABLE) unset(_findgit_role) endif() -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Git REQUIRED_VARS GIT_EXECUTABLE VERSION_VAR GIT_VERSION_STRING) diff --git a/Modules/FindGnuTLS.cmake b/Modules/FindGnuTLS.cmake index 5cc832a791..0cb8512869 100644 --- a/Modules/FindGnuTLS.cmake +++ b/Modules/FindGnuTLS.cmake @@ -66,7 +66,7 @@ find_library(GNUTLS_LIBRARY NAMES gnutls libgnutls mark_as_advanced(GNUTLS_INCLUDE_DIR GNUTLS_LIBRARY) -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(GnuTLS REQUIRED_VARS GNUTLS_LIBRARY GNUTLS_INCLUDE_DIR VERSION_VAR GNUTLS_VERSION_STRING) diff --git a/Modules/FindGnuplot.cmake b/Modules/FindGnuplot.cmake index 6f9fb81e24..f61c40640e 100644 --- a/Modules/FindGnuplot.cmake +++ b/Modules/FindGnuplot.cmake @@ -49,7 +49,7 @@ endif() # for compatibility set(GNUPLOT ${GNUPLOT_EXECUTABLE}) -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Gnuplot REQUIRED_VARS GNUPLOT_EXECUTABLE VERSION_VAR GNUPLOT_VERSION_STRING) diff --git a/Modules/FindHDF5.cmake b/Modules/FindHDF5.cmake index c74a6b6bad..291db80a99 100644 --- a/Modules/FindHDF5.cmake +++ b/Modules/FindHDF5.cmake @@ -155,7 +155,7 @@ The following variables can be set to guide the search for HDF5 libraries and in #]=======================================================================] include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake) -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) cmake_policy(PUSH) cmake_policy(SET CMP0159 NEW) # file(STRINGS) with REGEX updates CMAKE_MATCH_ diff --git a/Modules/FindHSPELL.cmake b/Modules/FindHSPELL.cmake index 80a2c2edca..875e9f3bdc 100644 --- a/Modules/FindHSPELL.cmake +++ b/Modules/FindHSPELL.cmake @@ -40,7 +40,7 @@ if (HSPELL_INCLUDE_DIR) unset(HSPELL_H) endif() -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(HSPELL REQUIRED_VARS HSPELL_LIBRARIES HSPELL_INCLUDE_DIR VERSION_VAR HSPELL_VERSION_STRING) diff --git a/Modules/FindHg.cmake b/Modules/FindHg.cmake index efcd76ffec..2dc5933611 100644 --- a/Modules/FindHg.cmake +++ b/Modules/FindHg.cmake @@ -92,7 +92,7 @@ if(HG_EXECUTABLE) endmacro() endif() -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Hg REQUIRED_VARS HG_EXECUTABLE VERSION_VAR HG_VERSION_STRING) diff --git a/Modules/FindICU.cmake b/Modules/FindICU.cmake index 6cfdb7d611..20523d1aee 100644 --- a/Modules/FindICU.cmake +++ b/Modules/FindICU.cmake @@ -295,7 +295,7 @@ endfunction() _ICU_FIND() -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(ICU REQUIRED_VARS ICU_INCLUDE_DIR diff --git a/Modules/FindIce.cmake b/Modules/FindIce.cmake index cac4eadf4f..6eb42286ea 100644 --- a/Modules/FindIce.cmake +++ b/Modules/FindIce.cmake @@ -540,7 +540,7 @@ endfunction() _Ice_FIND() -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Ice REQUIRED_VARS Ice_SLICE2CPP_EXECUTABLE Ice_INCLUDE_DIR diff --git a/Modules/FindIconv.cmake b/Modules/FindIconv.cmake index 876af8d4ff..d70b266c17 100644 --- a/Modules/FindIconv.cmake +++ b/Modules/FindIconv.cmake @@ -166,7 +166,7 @@ if(Iconv_INCLUDE_DIR AND EXISTS "${Iconv_INCLUDE_DIR}/iconv.h") unset(Iconv_VERSION_NUMBER) endif() -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Iconv REQUIRED_VARS ${_Iconv_REQUIRED_VARS} VERSION_VAR Iconv_VERSION) diff --git a/Modules/FindIcotool.cmake b/Modules/FindIcotool.cmake index 4d23f5b747..62b8d5f0e7 100644 --- a/Modules/FindIcotool.cmake +++ b/Modules/FindIcotool.cmake @@ -40,7 +40,7 @@ if(ICOTOOL_EXECUTABLE) unset(_icotool_version) endif() -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args( Icotool REQUIRED_VARS ICOTOOL_EXECUTABLE diff --git a/Modules/FindImageMagick.cmake b/Modules/FindImageMagick.cmake index 6cab3ab58c..8866b475a4 100644 --- a/Modules/FindImageMagick.cmake +++ b/Modules/FindImageMagick.cmake @@ -322,7 +322,7 @@ endif() #--------------------------------------------------------------------- # Standard Package Output #--------------------------------------------------------------------- -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(ImageMagick REQUIRED_VARS ${ImageMagick_REQUIRED_VARS} VERSION_VAR ImageMagick_VERSION_STRING diff --git a/Modules/FindIntl.cmake b/Modules/FindIntl.cmake index b89ed7884f..e442105964 100644 --- a/Modules/FindIntl.cmake +++ b/Modules/FindIntl.cmake @@ -160,7 +160,7 @@ if(Intl_INCLUDE_DIR AND EXISTS "${Intl_INCLUDE_DIR}/libintl.h") unset(Intl_VERSION_NUMBER) endif() -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Intl REQUIRED_VARS ${_Intl_REQUIRED_VARS} VERSION_VAR Intl_VERSION diff --git a/Modules/FindJPEG.cmake b/Modules/FindJPEG.cmake index a2c5e4e5c1..b50c4c965b 100644 --- a/Modules/FindJPEG.cmake +++ b/Modules/FindJPEG.cmake @@ -103,7 +103,7 @@ if(JPEG_INCLUDE_DIR) unset(_JPEG_CONFIG_HEADERS_DEBIAN) endif() -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(JPEG REQUIRED_VARS JPEG_LIBRARY JPEG_INCLUDE_DIR VERSION_VAR JPEG_VERSION) diff --git a/Modules/FindJasper.cmake b/Modules/FindJasper.cmake index 79afcd508d..7b74b41455 100644 --- a/Modules/FindJasper.cmake +++ b/Modules/FindJasper.cmake @@ -61,7 +61,7 @@ if(JASPER_INCLUDE_DIR AND EXISTS "${JASPER_INCLUDE_DIR}/jasper/jas_config.h") string(REGEX REPLACE "^#define[\t ]+JAS_VERSION[\t ]+\"([^\"]+)\".*" "\\1" JASPER_VERSION_STRING "${jasper_version_str}") endif() -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Jasper REQUIRED_VARS JASPER_LIBRARIES JASPER_INCLUDE_DIR JPEG_LIBRARIES VERSION_VAR JASPER_VERSION_STRING) diff --git a/Modules/FindJava.cmake b/Modules/FindJava.cmake index 4c5a6fa946..157b45797e 100644 --- a/Modules/FindJava.cmake +++ b/Modules/FindJava.cmake @@ -270,7 +270,7 @@ find_program(Java_JARSIGNER_EXECUTABLE PATHS ${_JAVA_PATHS} ) -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) if(Java_FIND_COMPONENTS) set(_JAVA_REQUIRED_VARS) foreach(component IN LISTS Java_FIND_COMPONENTS) diff --git a/Modules/FindLAPACK.cmake b/Modules/FindLAPACK.cmake index b237a90b28..74d30a4c85 100644 --- a/Modules/FindLAPACK.cmake +++ b/Modules/FindLAPACK.cmake @@ -110,7 +110,7 @@ if(CMAKE_Fortran_COMPILER_LOADED) else() include(${CMAKE_CURRENT_LIST_DIR}/CheckFunctionExists.cmake) endif() -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) function(_add_lapack_target) if(LAPACK_FOUND AND NOT TARGET LAPACK::LAPACK) diff --git a/Modules/FindLATEX.cmake b/Modules/FindLATEX.cmake index c0808f3d47..d75aa628ba 100644 --- a/Modules/FindLATEX.cmake +++ b/Modules/FindLATEX.cmake @@ -282,7 +282,7 @@ mark_as_advanced( HTLATEX_COMPILER ) -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(LATEX REQUIRED_VARS LATEX_COMPILER HANDLE_COMPONENTS diff --git a/Modules/FindLTTngUST.cmake b/Modules/FindLTTngUST.cmake index 32c6a16439..221919a963 100644 --- a/Modules/FindLTTngUST.cmake +++ b/Modules/FindLTTngUST.cmake @@ -97,7 +97,7 @@ if(LTTNGUST_INCLUDE_DIRS AND LTTNGUST_LIBRARIES) set(LTTNGUST_LIBRARIES ${LTTNGUST_LIBRARIES} ${CMAKE_DL_LIBS}) endif() -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(LTTngUST REQUIRED_VARS LTTNGUST_LIBRARIES LTTNGUST_INCLUDE_DIRS diff --git a/Modules/FindLibArchive.cmake b/Modules/FindLibArchive.cmake index 38a43db77a..02e336ee06 100644 --- a/Modules/FindLibArchive.cmake +++ b/Modules/FindLibArchive.cmake @@ -66,7 +66,7 @@ if(LibArchive_INCLUDE_DIR AND EXISTS "${LibArchive_INCLUDE_DIR}/archive.h") unset(_LibArchive_VERSION_STRING) endif() -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(LibArchive REQUIRED_VARS LibArchive_LIBRARY LibArchive_INCLUDE_DIR VERSION_VAR LibArchive_VERSION diff --git a/Modules/FindLibLZMA.cmake b/Modules/FindLibLZMA.cmake index 6e29bd9ec5..7cb37fbb0e 100644 --- a/Modules/FindLibLZMA.cmake +++ b/Modules/FindLibLZMA.cmake @@ -104,7 +104,7 @@ if (LIBLZMA_LIBRARY) set(CMAKE_REQUIRED_QUIET ${CMAKE_REQUIRED_QUIET_SAVE}) endif () -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(LibLZMA REQUIRED_VARS LIBLZMA_LIBRARY LIBLZMA_INCLUDE_DIR LIBLZMA_HAS_AUTO_DECODER diff --git a/Modules/FindLibXml2.cmake b/Modules/FindLibXml2.cmake index c68306d569..12d7dfa8a3 100644 --- a/Modules/FindLibXml2.cmake +++ b/Modules/FindLibXml2.cmake @@ -109,7 +109,7 @@ foreach(libxml2_pc_lib_dir IN LISTS PC_LIBXML_LIBDIR PC_LIBXML_LIBRARY_DIRS) endif() endforeach() -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(LibXml2 REQUIRED_VARS LIBXML2_LIBRARY LIBXML2_INCLUDE_DIR VERSION_VAR LIBXML2_VERSION_STRING) diff --git a/Modules/FindLibXslt.cmake b/Modules/FindLibXslt.cmake index 5f9c4c83b4..3109e300e9 100644 --- a/Modules/FindLibXslt.cmake +++ b/Modules/FindLibXslt.cmake @@ -111,7 +111,7 @@ elseif(LIBXSLT_INCLUDE_DIR AND EXISTS "${LIBXSLT_INCLUDE_DIR}/libxslt/xsltconfig unset(libxslt_version_str) endif() -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(LibXslt REQUIRED_VARS LIBXSLT_LIBRARIES LIBXSLT_INCLUDE_DIR VERSION_VAR LIBXSLT_VERSION_STRING) diff --git a/Modules/FindLua.cmake b/Modules/FindLua.cmake index 61f2818ca1..fa07ed3e78 100644 --- a/Modules/FindLua.cmake +++ b/Modules/FindLua.cmake @@ -230,7 +230,7 @@ if (LUA_LIBRARY) endif () endif () -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) # handle the QUIETLY and REQUIRED arguments and set LUA_FOUND to TRUE if # all listed variables are TRUE find_package_handle_standard_args(Lua diff --git a/Modules/FindLua50.cmake b/Modules/FindLua50.cmake index 8186c8eb32..6daec5f604 100644 --- a/Modules/FindLua50.cmake +++ b/Modules/FindLua50.cmake @@ -77,7 +77,7 @@ else() endif() -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) # handle the QUIETLY and REQUIRED arguments and set LUA_FOUND to TRUE if # all listed variables are TRUE find_package_handle_standard_args(Lua50 DEFAULT_MSG LUA_LIBRARIES LUA_INCLUDE_DIR) diff --git a/Modules/FindLua51.cmake b/Modules/FindLua51.cmake index b39543c841..0c12a3a6b1 100644 --- a/Modules/FindLua51.cmake +++ b/Modules/FindLua51.cmake @@ -72,7 +72,7 @@ if(LUA_INCLUDE_DIR AND EXISTS "${LUA_INCLUDE_DIR}/lua.h") unset(lua_version_str) endif() -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) # handle the QUIETLY and REQUIRED arguments and set LUA_FOUND to TRUE if # all listed variables are TRUE find_package_handle_standard_args(Lua51 diff --git a/Modules/FindMPEG.cmake b/Modules/FindMPEG.cmake index bd8139da2a..900ee360fe 100644 --- a/Modules/FindMPEG.cmake +++ b/Modules/FindMPEG.cmake @@ -30,7 +30,7 @@ find_library(MPEG_mpeg2_LIBRARY mpeg2) find_library(MPEG_vo_LIBRARY vo) -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(MPEG DEFAULT_MSG MPEG_mpeg2_LIBRARY MPEG_INCLUDE_DIR) if(MPEG_FOUND) diff --git a/Modules/FindMPEG2.cmake b/Modules/FindMPEG2.cmake index 85e798b64a..e04ecb9cf1 100644 --- a/Modules/FindMPEG2.cmake +++ b/Modules/FindMPEG2.cmake @@ -30,7 +30,7 @@ find_library(MPEG2_mpeg2_LIBRARY mpeg2) find_library(MPEG2_vo_LIBRARY vo) -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(MPEG2 DEFAULT_MSG MPEG2_mpeg2_LIBRARY MPEG2_INCLUDE_DIR) if(MPEG2_FOUND) diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake index fd7c234600..82d1df10d1 100644 --- a/Modules/FindMPI.cmake +++ b/Modules/FindMPI.cmake @@ -266,7 +266,7 @@ Additionally, the following variables are deprecated: cmake_policy(PUSH) cmake_policy(SET CMP0159 NEW) # file(STRINGS) with REGEX updates CMAKE_MATCH_ -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package(PkgConfig QUIET) # Generic compiler names diff --git a/Modules/FindMatlab.cmake b/Modules/FindMatlab.cmake index 60de042c07..ce44afad80 100644 --- a/Modules/FindMatlab.cmake +++ b/Modules/FindMatlab.cmake @@ -307,7 +307,7 @@ cmake_policy(SET CMP0159 NEW) # file(STRINGS) with REGEX updates CMAKE_MATCH_ set(_FindMatlab_SELF_DIR "${CMAKE_CURRENT_LIST_DIR}") -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) if(NOT WIN32 AND NOT APPLE AND NOT Threads_FOUND AND (CMAKE_C_COMPILER_LOADED OR CMAKE_CXX_COMPILER_LOADED)) diff --git a/Modules/FindMotif.cmake b/Modules/FindMotif.cmake index f4d09805a2..40c0dc5ee3 100644 --- a/Modules/FindMotif.cmake +++ b/Modules/FindMotif.cmake @@ -31,7 +31,7 @@ if(UNIX) endif() -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Motif DEFAULT_MSG MOTIF_LIBRARIES MOTIF_INCLUDE_DIR) mark_as_advanced( diff --git a/Modules/FindOpenACC.cmake b/Modules/FindOpenACC.cmake index d5d26a1f12..a7c1a0f170 100644 --- a/Modules/FindOpenACC.cmake +++ b/Modules/FindOpenACC.cmake @@ -260,7 +260,7 @@ macro(_OPENACC_SET_VERSION_BY_SPEC_DATE LANG) endmacro() -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) foreach (LANG IN ITEMS C CXX Fortran) if(CMAKE_${LANG}_COMPILER_LOADED) set(OpenACC_${LANG}_FIND_QUIETLY ${OpenACC_FIND_QUIETLY}) diff --git a/Modules/FindOpenAL.cmake b/Modules/FindOpenAL.cmake index c8e295b53f..eb0ba454ff 100644 --- a/Modules/FindOpenAL.cmake +++ b/Modules/FindOpenAL.cmake @@ -96,7 +96,7 @@ find_library(OPENAL_LIBRARY unset(_OpenAL_ARCH_DIR) -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args( OpenAL REQUIRED_VARS OPENAL_LIBRARY OPENAL_INCLUDE_DIR diff --git a/Modules/FindOpenCL.cmake b/Modules/FindOpenCL.cmake index 7fc259ba0e..13ff986e52 100644 --- a/Modules/FindOpenCL.cmake +++ b/Modules/FindOpenCL.cmake @@ -173,7 +173,7 @@ unset(_OPENCL_x86) set(OpenCL_LIBRARIES ${OpenCL_LIBRARY}) set(OpenCL_INCLUDE_DIRS ${OpenCL_INCLUDE_DIR}) -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args( OpenCL REQUIRED_VARS OpenCL_LIBRARY OpenCL_INCLUDE_DIR diff --git a/Modules/FindOpenGL.cmake b/Modules/FindOpenGL.cmake index b85c13c587..58c44067e6 100644 --- a/Modules/FindOpenGL.cmake +++ b/Modules/FindOpenGL.cmake @@ -569,7 +569,7 @@ if(OPENGL_EGL_INCLUDE_DIR) set(OPENGL_EGL_INCLUDE_DIRS ${OPENGL_EGL_INCLUDE_DIR}) endif() -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) if (CMAKE_FIND_PACKAGE_NAME STREQUAL "GLU") # FindGLU include()'s this module. It's an old pattern, but rather than # trying to suppress this from outside the module (which is then sensitive to diff --git a/Modules/FindOpenMP.cmake b/Modules/FindOpenMP.cmake index cbbf09d7dd..7093727264 100644 --- a/Modules/FindOpenMP.cmake +++ b/Modules/FindOpenMP.cmake @@ -623,7 +623,7 @@ endif() unset(_OpenMP_MIN_VERSION) -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) foreach(LANG IN LISTS OpenMP_FINDLIST) if(CMAKE_${LANG}_COMPILER_LOADED) diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake index 33a07650cc..2c320913ef 100644 --- a/Modules/FindOpenSSL.cmake +++ b/Modules/FindOpenSSL.cmake @@ -687,7 +687,7 @@ foreach(_comp IN LISTS OpenSSL_FIND_COMPONENTS) endforeach() unset(_comp) -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(OpenSSL REQUIRED_VARS OPENSSL_CRYPTO_LIBRARY diff --git a/Modules/FindOpenSceneGraph.cmake b/Modules/FindOpenSceneGraph.cmake index 7727aac956..3c96766a39 100644 --- a/Modules/FindOpenSceneGraph.cmake +++ b/Modules/FindOpenSceneGraph.cmake @@ -225,7 +225,7 @@ if(OpenSceneGraph_FIND_REQUIRED) endforeach() endif() -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(OpenSceneGraph REQUIRED_VARS OPENSCENEGRAPH_LIBRARIES OPENSCENEGRAPH_INCLUDE_DIR ${_osg_component_founds} VERSION_VAR OPENSCENEGRAPH_VERSION) diff --git a/Modules/FindOpenThreads.cmake b/Modules/FindOpenThreads.cmake index 5b5ca98f0a..adff23805f 100644 --- a/Modules/FindOpenThreads.cmake +++ b/Modules/FindOpenThreads.cmake @@ -104,6 +104,6 @@ find_library(OPENTHREADS_LIBRARY_DEBUG select_library_configurations(OPENTHREADS) -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(OpenThreads DEFAULT_MSG OPENTHREADS_LIBRARY OPENTHREADS_INCLUDE_DIR) diff --git a/Modules/FindPHP4.cmake b/Modules/FindPHP4.cmake index 4b7c43fe2e..f48b583033 100644 --- a/Modules/FindPHP4.cmake +++ b/Modules/FindPHP4.cmake @@ -78,5 +78,5 @@ if(APPLE) endforeach() endif() -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(PHP4 DEFAULT_MSG PHP4_EXECUTABLE PHP4_INCLUDE_PATH) diff --git a/Modules/FindPNG.cmake b/Modules/FindPNG.cmake index 4294326abe..3d867245ec 100644 --- a/Modules/FindPNG.cmake +++ b/Modules/FindPNG.cmake @@ -176,7 +176,7 @@ if(ZLIB_FOUND) endif () endif() -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(PNG REQUIRED_VARS PNG_LIBRARY PNG_PNG_INCLUDE_DIR VERSION_VAR PNG_VERSION_STRING) diff --git a/Modules/FindPatch.cmake b/Modules/FindPatch.cmake index 6a8f794e80..c1ac2a7350 100644 --- a/Modules/FindPatch.cmake +++ b/Modules/FindPatch.cmake @@ -78,6 +78,6 @@ unset(_patch_path) unset(_patch_role) unset(_doc) -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Patch REQUIRED_VARS Patch_EXECUTABLE) diff --git a/Modules/FindPerl.cmake b/Modules/FindPerl.cmake index 3655b79bc0..01fd1def3e 100644 --- a/Modules/FindPerl.cmake +++ b/Modules/FindPerl.cmake @@ -79,7 +79,7 @@ endif() # Deprecated settings for compatibility with CMake1.4 set(PERL ${PERL_EXECUTABLE}) -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) if (CMAKE_FIND_PACKAGE_NAME STREQUAL "PerlLibs") # FindPerlLibs include()'s this module. It's an old pattern, but rather than # trying to suppress this from outside the module (which is then sensitive to diff --git a/Modules/FindPerlLibs.cmake b/Modules/FindPerlLibs.cmake index d576b86cd5..2c1da6c0d7 100644 --- a/Modules/FindPerlLibs.cmake +++ b/Modules/FindPerlLibs.cmake @@ -145,7 +145,7 @@ if (PERL_EXECUTABLE) endif () -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(PerlLibs REQUIRED_VARS PERL_LIBRARY PERL_INCLUDE_PATH VERSION_VAR PERL_VERSION_STRING) diff --git a/Modules/FindPhysFS.cmake b/Modules/FindPhysFS.cmake index 21a7bca323..efb06bad38 100644 --- a/Modules/FindPhysFS.cmake +++ b/Modules/FindPhysFS.cmake @@ -42,5 +42,5 @@ find_library(PHYSFS_LIBRARY /opt ) -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(PhysFS DEFAULT_MSG PHYSFS_LIBRARY PHYSFS_INCLUDE_DIR) diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake index 19a2320c93..faba99c9af 100644 --- a/Modules/FindPkgConfig.cmake +++ b/Modules/FindPkgConfig.cmake @@ -106,7 +106,7 @@ if (PKG_CONFIG_EXECUTABLE) unset(_PKG_CONFIG_VERSION_RESULT) endif () -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(PkgConfig REQUIRED_VARS PKG_CONFIG_EXECUTABLE REASON_FAILURE_MESSAGE "${_PKG_CONFIG_FAILURE_MESSAGE}" diff --git a/Modules/FindPostgreSQL.cmake b/Modules/FindPostgreSQL.cmake index 4131a4ef89..927b9e021b 100644 --- a/Modules/FindPostgreSQL.cmake +++ b/Modules/FindPostgreSQL.cmake @@ -268,7 +268,7 @@ if("Server" IN_LIST PostgreSQL_FIND_COMPONENTS) endif() # Did we find anything? -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(PostgreSQL REQUIRED_VARS PostgreSQL_LIBRARY PostgreSQL_INCLUDE_DIR HANDLE_COMPONENTS diff --git a/Modules/FindProducer.cmake b/Modules/FindProducer.cmake index fba9912e84..0671a6224a 100644 --- a/Modules/FindProducer.cmake +++ b/Modules/FindProducer.cmake @@ -65,6 +65,6 @@ find_library(PRODUCER_LIBRARY /opt ) -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Producer DEFAULT_MSG PRODUCER_LIBRARY PRODUCER_INCLUDE_DIR) diff --git a/Modules/FindProtobuf.cmake b/Modules/FindProtobuf.cmake index 488411fe40..665190cd7f 100644 --- a/Modules/FindProtobuf.cmake +++ b/Modules/FindProtobuf.cmake @@ -807,7 +807,7 @@ if(Protobuf_INCLUDE_DIR) endif() endif() -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Protobuf REQUIRED_VARS Protobuf_LIBRARIES Protobuf_INCLUDE_DIR VERSION_VAR Protobuf_VERSION diff --git a/Modules/FindPython.cmake b/Modules/FindPython.cmake index 53bca912d3..04728ad7db 100644 --- a/Modules/FindPython.cmake +++ b/Modules/FindPython.cmake @@ -720,7 +720,7 @@ else() set (Python_FIND_REQUIRED_Interpreter TRUE) endif() - include (${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) + include(FindPackageHandleStandardArgs) find_package_handle_standard_args (Python HANDLE_COMPONENTS HANDLE_VERSION_RANGE VERSION_VAR Python_VERSION REASON_FAILURE_MESSAGE "Version range specified \"${Python_FIND_VERSION_RANGE}\" does not include supported versions") diff --git a/Modules/FindPython/Support.cmake b/Modules/FindPython/Support.cmake index 0506ae1ed0..93521cfcb2 100644 --- a/Modules/FindPython/Support.cmake +++ b/Modules/FindPython/Support.cmake @@ -33,7 +33,7 @@ endif() get_property(_${_PYTHON_PREFIX}_CMAKE_ROLE GLOBAL PROPERTY CMAKE_ROLE) -include (${CMAKE_CURRENT_LIST_DIR}/../FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) # # helper commands diff --git a/Modules/FindPythonInterp.cmake b/Modules/FindPythonInterp.cmake index 9dd88baa9b..1c76e64354 100644 --- a/Modules/FindPythonInterp.cmake +++ b/Modules/FindPythonInterp.cmake @@ -178,7 +178,7 @@ if(PYTHON_EXECUTABLE) unset(_VERSION) endif() -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(PythonInterp REQUIRED_VARS PYTHON_EXECUTABLE VERSION_VAR PYTHON_VERSION_STRING) mark_as_advanced(PYTHON_EXECUTABLE) diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake index 33b61d1aea..a932885c3a 100644 --- a/Modules/FindPythonLibs.cmake +++ b/Modules/FindPythonLibs.cmake @@ -326,7 +326,7 @@ else() unset(CMAKE_FIND_FRAMEWORK) endif() -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(PythonLibs REQUIRED_VARS PYTHON_LIBRARIES PYTHON_INCLUDE_DIRS VERSION_VAR PYTHONLIBS_VERSION_STRING) diff --git a/Modules/FindQt3.cmake b/Modules/FindQt3.cmake index a6b9a447ac..c919ffd03a 100644 --- a/Modules/FindQt3.cmake +++ b/Modules/FindQt3.cmake @@ -207,7 +207,7 @@ if(NOT Qt3_FIND_VERSION AND QT_MIN_VERSION) endif() # if the include a library are found then we have it -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) if (CMAKE_FIND_PACKAGE_NAME STREQUAL "Qt") # FindQt include()'s this module. It's an old pattern, but rather than trying # to suppress this from outside the module (which is then sensitive to the diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index 6608f2f62b..c4011c0e61 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake @@ -334,7 +334,7 @@ endif() include(${CMAKE_CURRENT_LIST_DIR}/CheckCXXSymbolExists.cmake) include(${CMAKE_CURRENT_LIST_DIR}/MacroAddFileDependencies.cmake) -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) include(${CMAKE_CURRENT_LIST_DIR}/CMakePushCheckState.cmake) set(QT_USE_FILE ${CMAKE_ROOT}/Modules/UseQt4.cmake) diff --git a/Modules/FindQuickTime.cmake b/Modules/FindQuickTime.cmake index ce363e7969..95a9a0dd63 100644 --- a/Modules/FindQuickTime.cmake +++ b/Modules/FindQuickTime.cmake @@ -32,5 +32,5 @@ find_library(QUICKTIME_LIBRARY QuickTime lib ) -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(QuickTime DEFAULT_MSG QUICKTIME_LIBRARY QUICKTIME_INCLUDE_DIR) diff --git a/Modules/FindRTI.cmake b/Modules/FindRTI.cmake index f449e47db9..2bee3eafa6 100644 --- a/Modules/FindRTI.cmake +++ b/Modules/FindRTI.cmake @@ -97,7 +97,7 @@ endif () # Set the modified system variables back to the original value. set(CMAKE_FIND_LIBRARY_PREFIXES "${RTI_OLD_FIND_LIBRARY_PREFIXES}") -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(RTI DEFAULT_MSG RTI_LIBRARY RTI_INCLUDE_DIR) diff --git a/Modules/FindRuby.cmake b/Modules/FindRuby.cmake index 2b70319d2b..bde2a9398e 100644 --- a/Modules/FindRuby.cmake +++ b/Modules/FindRuby.cmake @@ -436,7 +436,7 @@ if (_Ruby_DEBUG_OUTPUT) message(STATUS "--------------------") endif () -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Ruby REQUIRED_VARS ${_Ruby_REQUIRED_VARS} VERSION_VAR Ruby_VERSION) diff --git a/Modules/FindSDL.cmake b/Modules/FindSDL.cmake index 66539950a2..3787231888 100644 --- a/Modules/FindSDL.cmake +++ b/Modules/FindSDL.cmake @@ -222,7 +222,7 @@ if(SDL_INCLUDE_DIR AND EXISTS "${SDL_INCLUDE_DIR}/SDL_version.h") set(SDL_VERSION_STRING ${SDL_VERSION}) endif() -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(SDL REQUIRED_VARS SDL_LIBRARY SDL_INCLUDE_DIR diff --git a/Modules/FindSDL_image.cmake b/Modules/FindSDL_image.cmake index 9849186b24..12d6c13d1d 100644 --- a/Modules/FindSDL_image.cmake +++ b/Modules/FindSDL_image.cmake @@ -86,7 +86,7 @@ endif() set(SDL_IMAGE_LIBRARIES ${SDL_IMAGE_LIBRARY}) set(SDL_IMAGE_INCLUDE_DIRS ${SDL_IMAGE_INCLUDE_DIR}) -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(SDL_image REQUIRED_VARS SDL_IMAGE_LIBRARIES SDL_IMAGE_INCLUDE_DIRS diff --git a/Modules/FindSDL_mixer.cmake b/Modules/FindSDL_mixer.cmake index 92ee4e4490..2f9cc47d2f 100644 --- a/Modules/FindSDL_mixer.cmake +++ b/Modules/FindSDL_mixer.cmake @@ -86,7 +86,7 @@ endif() set(SDL_MIXER_LIBRARIES ${SDL_MIXER_LIBRARY}) set(SDL_MIXER_INCLUDE_DIRS ${SDL_MIXER_INCLUDE_DIR}) -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(SDL_mixer REQUIRED_VARS SDL_MIXER_LIBRARIES SDL_MIXER_INCLUDE_DIRS diff --git a/Modules/FindSDL_net.cmake b/Modules/FindSDL_net.cmake index 5a5881b425..a8c959e82f 100644 --- a/Modules/FindSDL_net.cmake +++ b/Modules/FindSDL_net.cmake @@ -85,7 +85,7 @@ endif() set(SDL_NET_LIBRARIES ${SDL_NET_LIBRARY}) set(SDL_NET_INCLUDE_DIRS ${SDL_NET_INCLUDE_DIR}) -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(SDL_net REQUIRED_VARS SDL_NET_LIBRARIES SDL_NET_INCLUDE_DIRS diff --git a/Modules/FindSDL_sound.cmake b/Modules/FindSDL_sound.cmake index 33cff04678..7f84c12dc7 100644 --- a/Modules/FindSDL_sound.cmake +++ b/Modules/FindSDL_sound.cmake @@ -369,7 +369,7 @@ if(SDL_SOUND_INCLUDE_DIR AND EXISTS "${SDL_SOUND_INCLUDE_DIR}/SDL_sound.h") unset(SDL_SOUND_VERSION_PATCH) endif() -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(SDL_sound REQUIRED_VARS SDL_SOUND_LIBRARY SDL_SOUND_INCLUDE_DIR diff --git a/Modules/FindSDL_ttf.cmake b/Modules/FindSDL_ttf.cmake index 7105185064..6a778ce959 100644 --- a/Modules/FindSDL_ttf.cmake +++ b/Modules/FindSDL_ttf.cmake @@ -85,7 +85,7 @@ endif() set(SDL_TTF_LIBRARIES ${SDL_TTF_LIBRARY}) set(SDL_TTF_INCLUDE_DIRS ${SDL_TTF_INCLUDE_DIR}) -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(SDL_ttf REQUIRED_VARS SDL_TTF_LIBRARIES SDL_TTF_INCLUDE_DIRS diff --git a/Modules/FindSQLite3.cmake b/Modules/FindSQLite3.cmake index e5fead7122..025f5f15a8 100644 --- a/Modules/FindSQLite3.cmake +++ b/Modules/FindSQLite3.cmake @@ -64,7 +64,7 @@ if(SQLite3_INCLUDE_DIR) unset(_ver_line) endif() -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(SQLite3 REQUIRED_VARS SQLite3_INCLUDE_DIR SQLite3_LIBRARY VERSION_VAR SQLite3_VERSION) diff --git a/Modules/FindSWIG.cmake b/Modules/FindSWIG.cmake index 3104b2cae6..94c75cc6bc 100644 --- a/Modules/FindSWIG.cmake +++ b/Modules/FindSWIG.cmake @@ -58,7 +58,7 @@ optional Fortran support: #]=======================================================================] -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) function(_swig_get_version _swig_executable _swig_version) unset(${_swig_version} PARENT_SCOPE) diff --git a/Modules/FindSquish.cmake b/Modules/FindSquish.cmake index 3291d3dca0..d6a10ce617 100644 --- a/Modules/FindSquish.cmake +++ b/Modules/FindSquish.cmake @@ -188,7 +188,7 @@ else() endif() # record if Squish was found -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) 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/FindSubversion.cmake b/Modules/FindSubversion.cmake index 0342a11f7d..066a4cacd6 100644 --- a/Modules/FindSubversion.cmake +++ b/Modules/FindSubversion.cmake @@ -160,7 +160,7 @@ if(Subversion_SVN_EXECUTABLE) endif() -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Subversion REQUIRED_VARS Subversion_SVN_EXECUTABLE VERSION_VAR Subversion_VERSION_SVN ) diff --git a/Modules/FindTCL.cmake b/Modules/FindTCL.cmake index 8720f3b694..d5bbc4c256 100644 --- a/Modules/FindTCL.cmake +++ b/Modules/FindTCL.cmake @@ -224,7 +224,7 @@ find_path(TK_INCLUDE_PATH PATH_SUFFIXES ${TCLTK_POSSIBLE_INCLUDE_PATH_SUFFIXES} ) -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) if (CMAKE_FIND_PACKAGE_NAME STREQUAL "TclStub") # FindTclStub include()'s this module. It's an old pattern, but rather than diff --git a/Modules/FindTIFF.cmake b/Modules/FindTIFF.cmake index b53a191c51..510290a4b9 100644 --- a/Modules/FindTIFF.cmake +++ b/Modules/FindTIFF.cmake @@ -207,7 +207,7 @@ if (Tiff_FOUND) endforeach () unset(_TIFF_component) - include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) + include(FindPackageHandleStandardArgs) find_package_handle_standard_args(TIFF HANDLE_COMPONENTS REQUIRED_VARS Tiff_DIR @@ -269,7 +269,7 @@ unset(_comp) unset(TIFF_NAMES) unset(TIFF_NAMES_DEBUG) -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(TIFF HANDLE_COMPONENTS REQUIRED_VARS TIFF_LIBRARY TIFF_INCLUDE_DIR diff --git a/Modules/FindTclsh.cmake b/Modules/FindTclsh.cmake index b016324a8d..17ae6f12f4 100644 --- a/Modules/FindTclsh.cmake +++ b/Modules/FindTclsh.cmake @@ -84,7 +84,7 @@ if(TCL_TCLSH) OUTPUT_STRIP_TRAILING_WHITESPACE) endif() -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) if (CMAKE_FIND_PACKAGE_NAME STREQUAL "TCL" OR CMAKE_FIND_PACKAGE_NAME STREQUAL "TclStub") # FindTCL include()'s this module. It's an old pattern, but rather than diff --git a/Modules/FindThreads.cmake b/Modules/FindThreads.cmake index e234734b6a..6f48a992e9 100644 --- a/Modules/FindThreads.cmake +++ b/Modules/FindThreads.cmake @@ -222,7 +222,7 @@ if(CMAKE_USE_PTHREADS_INIT) endif() set(CMAKE_REQUIRED_QUIET ${CMAKE_REQUIRED_QUIET_SAVE}) -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Threads DEFAULT_MSG Threads_FOUND) if(THREADS_FOUND AND NOT TARGET Threads::Threads) diff --git a/Modules/FindUnixCommands.cmake b/Modules/FindUnixCommands.cmake index d71518f253..140a8f54e3 100644 --- a/Modules/FindUnixCommands.cmake +++ b/Modules/FindUnixCommands.cmake @@ -76,7 +76,7 @@ mark_as_advanced( TAR ) -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(UnixCommands REQUIRED_VARS BASH CP GZIP MV RM TAR ) diff --git a/Modules/FindVulkan.cmake b/Modules/FindVulkan.cmake index c3ba2db9b9..893c097a00 100644 --- a/Modules/FindVulkan.cmake +++ b/Modules/FindVulkan.cmake @@ -590,7 +590,7 @@ if(Vulkan_MoltenVK_FOUND) endif() endif() -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Vulkan REQUIRED_VARS Vulkan_LIBRARY diff --git a/Modules/FindWget.cmake b/Modules/FindWget.cmake index ed977e26dc..34ba74b56d 100644 --- a/Modules/FindWget.cmake +++ b/Modules/FindWget.cmake @@ -24,7 +24,7 @@ find_program(WGET_EXECUTABLE ${MSYS_INSTALL_PATH}/usr/bin ) -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Wget DEFAULT_MSG WGET_EXECUTABLE) mark_as_advanced( WGET_EXECUTABLE ) diff --git a/Modules/FindX11.cmake b/Modules/FindX11.cmake index b584c3c56d..9dee9486ec 100644 --- a/Modules/FindX11.cmake +++ b/Modules/FindX11.cmake @@ -673,7 +673,7 @@ if (UNIX) set(X11_FOUND 1) endif () - include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) + include(FindPackageHandleStandardArgs) if (CMAKE_FIND_PACKAGE_NAME STREQUAL "FLTK") # FindFLTK include()'s this module. It's an old pattern, but rather than # trying to suppress this from outside the module (which is then sensitive diff --git a/Modules/FindXCTest.cmake b/Modules/FindXCTest.cmake index 957800ef8d..1f4efe356c 100644 --- a/Modules/FindXCTest.cmake +++ b/Modules/FindXCTest.cmake @@ -105,7 +105,7 @@ if(_xcrun_out) mark_as_advanced(XCTest_EXECUTABLE) endif() -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(XCTest REQUIRED_VARS XCTest_LIBRARY XCTest_INCLUDE_DIR XCTest_EXECUTABLE) diff --git a/Modules/FindXMLRPC.cmake b/Modules/FindXMLRPC.cmake index 4c813e7656..5b18bac194 100644 --- a/Modules/FindXMLRPC.cmake +++ b/Modules/FindXMLRPC.cmake @@ -122,7 +122,7 @@ if(XMLRPC_C_FOUND) endif() # Report the results. -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args( XMLRPC REQUIRED_VARS XMLRPC_C_FOUND XMLRPC_LIBRARIES diff --git a/Modules/FindXalanC.cmake b/Modules/FindXalanC.cmake index 74f0af7148..fc091b3361 100644 --- a/Modules/FindXalanC.cmake +++ b/Modules/FindXalanC.cmake @@ -113,7 +113,7 @@ endif() find_package(XercesC ${XalanC_XERCESC_REQUIRED}) unset(XalanC_XERCESC_REQUIRED) -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(XalanC REQUIRED_VARS XalanC_LIBRARY XalanC_INCLUDE_DIR diff --git a/Modules/FindXercesC.cmake b/Modules/FindXercesC.cmake index 851381bda0..bf350b2503 100644 --- a/Modules/FindXercesC.cmake +++ b/Modules/FindXercesC.cmake @@ -111,7 +111,7 @@ unset(XercesC_VERSION_MAJOR) unset(XercesC_VERSION_MINOR) unset(XercesC_VERSION_PATCH) -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(XercesC REQUIRED_VARS XercesC_LIBRARY XercesC_INCLUDE_DIR diff --git a/Modules/FindZLIB.cmake b/Modules/FindZLIB.cmake index 4271e63288..ea56e71a28 100644 --- a/Modules/FindZLIB.cmake +++ b/Modules/FindZLIB.cmake @@ -198,7 +198,7 @@ if(ZLIB_INCLUDE_DIR AND EXISTS "${ZLIB_INCLUDE_DIR}/zlib.h") set(ZLIB_VERSION "${ZLIB_VERSION_STRING}") endif() -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(ZLIB REQUIRED_VARS ZLIB_LIBRARY ZLIB_INCLUDE_DIR VERSION_VAR ZLIB_VERSION HANDLE_COMPONENTS) diff --git a/Modules/Findosg.cmake b/Modules/Findosg.cmake index bd2ba708a8..8e01d64812 100644 --- a/Modules/Findosg.cmake +++ b/Modules/Findosg.cmake @@ -53,5 +53,5 @@ include(${CMAKE_CURRENT_LIST_DIR}/Findosg_functions.cmake) OSG_FIND_PATH (OSG osg/PositionAttitudeTransform) OSG_FIND_LIBRARY(OSG osg) -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(osg DEFAULT_MSG OSG_LIBRARY OSG_INCLUDE_DIR) diff --git a/Modules/FindosgAnimation.cmake b/Modules/FindosgAnimation.cmake index 798d608ea1..f2c32a36b9 100644 --- a/Modules/FindosgAnimation.cmake +++ b/Modules/FindosgAnimation.cmake @@ -47,6 +47,6 @@ include(${CMAKE_CURRENT_LIST_DIR}/Findosg_functions.cmake) OSG_FIND_PATH (OSGANIMATION osgAnimation/Animation) OSG_FIND_LIBRARY(OSGANIMATION osgAnimation) -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(osgAnimation DEFAULT_MSG OSGANIMATION_LIBRARY OSGANIMATION_INCLUDE_DIR) diff --git a/Modules/FindosgDB.cmake b/Modules/FindosgDB.cmake index c162cdfed6..cfaeaaaa2d 100644 --- a/Modules/FindosgDB.cmake +++ b/Modules/FindosgDB.cmake @@ -51,6 +51,6 @@ include(${CMAKE_CURRENT_LIST_DIR}/Findosg_functions.cmake) OSG_FIND_PATH (OSGDB osgDB/DatabasePager) OSG_FIND_LIBRARY(OSGDB osgDB) -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(osgDB DEFAULT_MSG OSGDB_LIBRARY OSGDB_INCLUDE_DIR) diff --git a/Modules/FindosgFX.cmake b/Modules/FindosgFX.cmake index 02b1b03be4..89d8748b45 100644 --- a/Modules/FindosgFX.cmake +++ b/Modules/FindosgFX.cmake @@ -48,6 +48,6 @@ include(${CMAKE_CURRENT_LIST_DIR}/Findosg_functions.cmake) OSG_FIND_PATH (OSGFX osgFX/BumpMapping) OSG_FIND_LIBRARY(OSGFX osgFX) -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(osgFX DEFAULT_MSG OSGFX_LIBRARY OSGFX_INCLUDE_DIR) diff --git a/Modules/FindosgGA.cmake b/Modules/FindosgGA.cmake index b2cd793b5e..9979dea2cd 100644 --- a/Modules/FindosgGA.cmake +++ b/Modules/FindosgGA.cmake @@ -48,6 +48,6 @@ include(${CMAKE_CURRENT_LIST_DIR}/Findosg_functions.cmake) OSG_FIND_PATH (OSGGA osgGA/FlightManipulator) OSG_FIND_LIBRARY(OSGGA osgGA) -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(osgGA DEFAULT_MSG OSGGA_LIBRARY OSGGA_INCLUDE_DIR) diff --git a/Modules/FindosgIntrospection.cmake b/Modules/FindosgIntrospection.cmake index ed6fc80cbd..b3666f2d2d 100644 --- a/Modules/FindosgIntrospection.cmake +++ b/Modules/FindosgIntrospection.cmake @@ -48,6 +48,6 @@ include(${CMAKE_CURRENT_LIST_DIR}/Findosg_functions.cmake) OSG_FIND_PATH (OSGINTROSPECTION osgIntrospection/Reflection) OSG_FIND_LIBRARY(OSGINTROSPECTION osgIntrospection) -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(osgIntrospection DEFAULT_MSG OSGINTROSPECTION_LIBRARY OSGINTROSPECTION_INCLUDE_DIR) diff --git a/Modules/FindosgManipulator.cmake b/Modules/FindosgManipulator.cmake index cfc1c1fed9..8b075e96d6 100644 --- a/Modules/FindosgManipulator.cmake +++ b/Modules/FindosgManipulator.cmake @@ -48,6 +48,6 @@ include(${CMAKE_CURRENT_LIST_DIR}/Findosg_functions.cmake) OSG_FIND_PATH (OSGMANIPULATOR osgManipulator/TrackballDragger) OSG_FIND_LIBRARY(OSGMANIPULATOR osgManipulator) -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(osgManipulator DEFAULT_MSG OSGMANIPULATOR_LIBRARY OSGMANIPULATOR_INCLUDE_DIR) diff --git a/Modules/FindosgParticle.cmake b/Modules/FindosgParticle.cmake index d33b5dd845..4b195dc2d9 100644 --- a/Modules/FindosgParticle.cmake +++ b/Modules/FindosgParticle.cmake @@ -48,6 +48,6 @@ include(${CMAKE_CURRENT_LIST_DIR}/Findosg_functions.cmake) OSG_FIND_PATH (OSGPARTICLE osgParticle/FireEffect) OSG_FIND_LIBRARY(OSGPARTICLE osgParticle) -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(osgParticle DEFAULT_MSG OSGPARTICLE_LIBRARY OSGPARTICLE_INCLUDE_DIR) diff --git a/Modules/FindosgPresentation.cmake b/Modules/FindosgPresentation.cmake index edfce3b27e..9158db86c1 100644 --- a/Modules/FindosgPresentation.cmake +++ b/Modules/FindosgPresentation.cmake @@ -48,6 +48,6 @@ include(${CMAKE_CURRENT_LIST_DIR}/Findosg_functions.cmake) OSG_FIND_PATH (OSGPRESENTATION osgPresentation/SlideEventHandler) OSG_FIND_LIBRARY(OSGPRESENTATION osgPresentation) -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(osgPresentation DEFAULT_MSG OSGPRESENTATION_LIBRARY OSGPRESENTATION_INCLUDE_DIR) diff --git a/Modules/FindosgProducer.cmake b/Modules/FindosgProducer.cmake index f351cb3c65..932a98aa12 100644 --- a/Modules/FindosgProducer.cmake +++ b/Modules/FindosgProducer.cmake @@ -48,6 +48,6 @@ include(${CMAKE_CURRENT_LIST_DIR}/Findosg_functions.cmake) OSG_FIND_PATH (OSGPRODUCER osgProducer/OsgSceneHandler) OSG_FIND_LIBRARY(OSGPRODUCER osgProducer) -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(osgProducer DEFAULT_MSG OSGPRODUCER_LIBRARY OSGPRODUCER_INCLUDE_DIR) diff --git a/Modules/FindosgQt.cmake b/Modules/FindosgQt.cmake index 98e00e127f..2dc7165d6e 100644 --- a/Modules/FindosgQt.cmake +++ b/Modules/FindosgQt.cmake @@ -49,6 +49,6 @@ include(${CMAKE_CURRENT_LIST_DIR}/Findosg_functions.cmake) OSG_FIND_PATH (OSGQT osgQt/GraphicsWindowQt) OSG_FIND_LIBRARY(OSGQT osgQt) -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(osgQt DEFAULT_MSG OSGQT_LIBRARY OSGQT_INCLUDE_DIR) diff --git a/Modules/FindosgShadow.cmake b/Modules/FindosgShadow.cmake index 9157b6cec0..41b5236f0f 100644 --- a/Modules/FindosgShadow.cmake +++ b/Modules/FindosgShadow.cmake @@ -48,6 +48,6 @@ include(${CMAKE_CURRENT_LIST_DIR}/Findosg_functions.cmake) OSG_FIND_PATH (OSGSHADOW osgShadow/ShadowTexture) OSG_FIND_LIBRARY(OSGSHADOW osgShadow) -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(osgShadow DEFAULT_MSG OSGSHADOW_LIBRARY OSGSHADOW_INCLUDE_DIR) diff --git a/Modules/FindosgSim.cmake b/Modules/FindosgSim.cmake index ef242f716f..97ae23b36a 100644 --- a/Modules/FindosgSim.cmake +++ b/Modules/FindosgSim.cmake @@ -48,6 +48,6 @@ include(${CMAKE_CURRENT_LIST_DIR}/Findosg_functions.cmake) OSG_FIND_PATH (OSGSIM osgSim/ImpostorSprite) OSG_FIND_LIBRARY(OSGSIM osgSim) -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(osgSim DEFAULT_MSG OSGSIM_LIBRARY OSGSIM_INCLUDE_DIR) diff --git a/Modules/FindosgTerrain.cmake b/Modules/FindosgTerrain.cmake index 0b1b3cf4da..746b909d58 100644 --- a/Modules/FindosgTerrain.cmake +++ b/Modules/FindosgTerrain.cmake @@ -48,6 +48,6 @@ include(${CMAKE_CURRENT_LIST_DIR}/Findosg_functions.cmake) OSG_FIND_PATH (OSGTERRAIN osgTerrain/Terrain) OSG_FIND_LIBRARY(OSGTERRAIN osgTerrain) -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(osgTerrain DEFAULT_MSG OSGTERRAIN_LIBRARY OSGTERRAIN_INCLUDE_DIR) diff --git a/Modules/FindosgText.cmake b/Modules/FindosgText.cmake index aee362d33d..7d7e919108 100644 --- a/Modules/FindosgText.cmake +++ b/Modules/FindosgText.cmake @@ -48,6 +48,6 @@ include(${CMAKE_CURRENT_LIST_DIR}/Findosg_functions.cmake) OSG_FIND_PATH (OSGTEXT osgText/Text) OSG_FIND_LIBRARY(OSGTEXT osgText) -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(osgText DEFAULT_MSG OSGTEXT_LIBRARY OSGTEXT_INCLUDE_DIR) diff --git a/Modules/FindosgUtil.cmake b/Modules/FindosgUtil.cmake index e82cc2bafb..7066cb62fa 100644 --- a/Modules/FindosgUtil.cmake +++ b/Modules/FindosgUtil.cmake @@ -48,6 +48,6 @@ include(${CMAKE_CURRENT_LIST_DIR}/Findosg_functions.cmake) OSG_FIND_PATH (OSGUTIL osgUtil/SceneView) OSG_FIND_LIBRARY(OSGUTIL osgUtil) -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(osgUtil DEFAULT_MSG OSGUTIL_LIBRARY OSGUTIL_INCLUDE_DIR) diff --git a/Modules/FindosgViewer.cmake b/Modules/FindosgViewer.cmake index 8de19c6628..53fa863103 100644 --- a/Modules/FindosgViewer.cmake +++ b/Modules/FindosgViewer.cmake @@ -48,6 +48,6 @@ include(${CMAKE_CURRENT_LIST_DIR}/Findosg_functions.cmake) OSG_FIND_PATH (OSGVIEWER osgViewer/Viewer) OSG_FIND_LIBRARY(OSGVIEWER osgViewer) -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(osgViewer DEFAULT_MSG OSGVIEWER_LIBRARY OSGVIEWER_INCLUDE_DIR) diff --git a/Modules/FindosgVolume.cmake b/Modules/FindosgVolume.cmake index d58aaeed03..fcb8e084d1 100644 --- a/Modules/FindosgVolume.cmake +++ b/Modules/FindosgVolume.cmake @@ -48,6 +48,6 @@ include(${CMAKE_CURRENT_LIST_DIR}/Findosg_functions.cmake) OSG_FIND_PATH (OSGVOLUME osgVolume/Volume) OSG_FIND_LIBRARY(OSGVOLUME osgVolume) -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(osgVolume DEFAULT_MSG OSGVOLUME_LIBRARY OSGVOLUME_INCLUDE_DIR) diff --git a/Modules/FindosgWidget.cmake b/Modules/FindosgWidget.cmake index 39998f8852..10ff82859a 100644 --- a/Modules/FindosgWidget.cmake +++ b/Modules/FindosgWidget.cmake @@ -49,6 +49,6 @@ include(${CMAKE_CURRENT_LIST_DIR}/Findosg_functions.cmake) OSG_FIND_PATH (OSGWIDGET osgWidget/Widget) OSG_FIND_LIBRARY(OSGWIDGET osgWidget) -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args(osgWidget DEFAULT_MSG OSGWIDGET_LIBRARY OSGWIDGET_INCLUDE_DIR) diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake index 7528d132ac..fc9feb9878 100644 --- a/Modules/FindwxWidgets.cmake +++ b/Modules/FindwxWidgets.cmake @@ -1000,7 +1000,7 @@ DBG_MSG("wxWidgets_USE_FILE : ${wxWidgets_USE_FILE}") #===================================================================== #===================================================================== -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) # FIXME: set wxWidgets__FOUND for wx-config branch # and use HANDLE_COMPONENTS on Unix too