From 4e6a13f211b148b89e426c76d0574d61c94f2253 Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Tue, 28 Jan 2025 12:18:13 +0100 Subject: [PATCH] Use lower case style for commands Where possible this syncs the CS for command names: - check_c_source_compiles() - check_cxx_compiler_flag() - check_cxx_source_compiles() - check_cxx_symbol_exists() - check_include_file_cxx() - check_include_file() - check_include_files() - check_library_exists() - check_source_compiles() - check_struct_has_member() - check_symbol_exists() - check_type_size() - cmake_dependent_option() - cmake_parse_arguments() - feature_summary() - file() - find_package_handle_standard_args() - if(), endif... - install(FILES) - list() - message() - pkg_check_modules() - select_library_configurations() - set_package_info() - test_big_endian() --- CMakeLists.txt | 16 ++++++------- Help/command/find_package.rst | 4 ++-- Help/command/install.rst | 2 +- Help/guide/importing-exporting/index.rst | 2 +- Help/release/3.11.rst | 2 +- Help/release/3.3.rst | 2 +- .../PushToAndroidDevice.cmake | 4 ++-- Modules/CMakeAddNewLanguage.txt | 2 +- Modules/CMakeBackwardCompatibilityC.cmake | 24 +++++++++---------- Modules/CheckStructHasMember.cmake | 4 ++-- Modules/FeatureSummary.cmake | 12 +++++----- Modules/FindALSA.cmake | 2 +- Modules/FindASPELL.cmake | 2 +- Modules/FindAVIFile.cmake | 2 +- Modules/FindBISON.cmake | 2 +- Modules/FindBZip2.cmake | 6 ++--- Modules/FindBullet.cmake | 2 +- Modules/FindCUDA.cmake | 8 +++---- Modules/FindCUDA/select_compute_arch.cmake | 2 +- Modules/FindCoin3D.cmake | 2 +- Modules/FindCups.cmake | 6 ++--- Modules/FindCurses.cmake | 10 ++++---- Modules/FindCxxTest.cmake | 4 ++-- Modules/FindDart.cmake | 2 +- Modules/FindDevIL.cmake | 2 +- Modules/FindEXPAT.cmake | 2 +- Modules/FindFLEX.cmake | 2 +- Modules/FindFLTK.cmake | 4 ++-- Modules/FindGDAL.cmake | 2 +- Modules/FindGIF.cmake | 4 ++-- Modules/FindGLUT.cmake | 2 +- Modules/FindGTK2.cmake | 8 +++---- Modules/FindGTest.cmake | 4 ++-- Modules/FindGettext.cmake | 6 ++--- Modules/FindGnuTLS.cmake | 4 ++-- Modules/FindGnuplot.cmake | 2 +- Modules/FindHSPELL.cmake | 2 +- Modules/FindIce.cmake | 2 +- Modules/FindIcotool.cmake | 2 +- Modules/FindImageMagick.cmake | 2 +- Modules/FindIntl.cmake | 2 +- Modules/FindLibLZMA.cmake | 6 ++--- Modules/FindLibXml2.cmake | 4 ++-- Modules/FindLibXslt.cmake | 6 ++--- Modules/FindLua.cmake | 2 +- Modules/FindLua50.cmake | 2 +- Modules/FindLua51.cmake | 2 +- Modules/FindMPEG.cmake | 2 +- Modules/FindMPEG2.cmake | 2 +- Modules/FindMotif.cmake | 2 +- Modules/FindOpenCL.cmake | 4 ++-- Modules/FindOpenGL.cmake | 2 +- Modules/FindOpenSceneGraph.cmake | 2 +- Modules/FindOpenThreads.cmake | 2 +- Modules/FindPHP4.cmake | 2 +- Modules/FindPerl.cmake | 2 +- Modules/FindPhysFS.cmake | 2 +- Modules/FindPkgConfig.cmake | 2 +- Modules/FindProducer.cmake | 2 +- Modules/FindProtobuf.cmake | 2 +- Modules/FindPythonInterp.cmake | 2 +- Modules/FindPythonLibs.cmake | 8 +++---- Modules/FindQt3.cmake | 2 +- Modules/FindQt4.cmake | 14 +++++------ Modules/FindQuickTime.cmake | 2 +- Modules/FindRTI.cmake | 2 +- Modules/FindRuby.cmake | 2 +- Modules/FindSDL.cmake | 2 +- Modules/FindSDL_gfx.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/FindSubversion.cmake | 2 +- Modules/FindTCL.cmake | 6 ++--- Modules/FindTIFF.cmake | 2 +- Modules/FindTclsh.cmake | 2 +- Modules/FindThreads.cmake | 10 ++++---- Modules/FindWget.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/GoogleTest.cmake | 2 +- Modules/Platform/Darwin.cmake | 2 +- Modules/Platform/GHS-MULTI-Determine.cmake | 4 ++-- Modules/Platform/Haiku.cmake | 16 ++++++------- Modules/Qt4ConfigDependentSettings.cmake | 2 +- Modules/TestBigEndian.cmake | 6 ++--- Modules/TestForANSIStreamHeaders.cmake | 2 +- Source/Modules/FindJsonCpp.cmake | 2 +- Source/Modules/FindLibRHash.cmake | 2 +- Source/Modules/FindLibUUID.cmake | 2 +- Source/Modules/FindLibUV.cmake | 2 +- Tests/CMakeLists.txt | 2 +- 115 files changed, 193 insertions(+), 193 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ae1359efec..c1a12cb100 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -196,18 +196,18 @@ macro(CMAKE_HANDLE_SYSTEM_LIBRARIES) endif() option(CMAKE_USE_SYSTEM_CURL "Use system-installed curl" "${CMAKE_USE_SYSTEM_LIBRARY_CURL}") option(CMAKE_USE_SYSTEM_EXPAT "Use system-installed expat" "${CMAKE_USE_SYSTEM_LIBRARY_EXPAT}") - CMAKE_DEPENDENT_OPTION(CMAKE_USE_SYSTEM_ZLIB "Use system-installed zlib" + cmake_dependent_option(CMAKE_USE_SYSTEM_ZLIB "Use system-installed zlib" "${CMAKE_USE_SYSTEM_LIBRARY_ZLIB}" "NOT CMAKE_USE_SYSTEM_LIBARCHIVE;NOT CMAKE_USE_SYSTEM_CURL" ON) - CMAKE_DEPENDENT_OPTION(CMAKE_USE_SYSTEM_BZIP2 "Use system-installed bzip2" + cmake_dependent_option(CMAKE_USE_SYSTEM_BZIP2 "Use system-installed bzip2" "${CMAKE_USE_SYSTEM_LIBRARY_BZIP2}" "NOT CMAKE_USE_SYSTEM_LIBARCHIVE" ON) - CMAKE_DEPENDENT_OPTION(CMAKE_USE_SYSTEM_ZSTD "Use system-installed zstd" + cmake_dependent_option(CMAKE_USE_SYSTEM_ZSTD "Use system-installed zstd" "${CMAKE_USE_SYSTEM_LIBRARY_ZSTD}" "NOT CMAKE_USE_SYSTEM_LIBARCHIVE" ON) - CMAKE_DEPENDENT_OPTION(CMAKE_USE_SYSTEM_LIBLZMA "Use system-installed liblzma" + cmake_dependent_option(CMAKE_USE_SYSTEM_LIBLZMA "Use system-installed liblzma" "${CMAKE_USE_SYSTEM_LIBRARY_LIBLZMA}" "NOT CMAKE_USE_SYSTEM_LIBARCHIVE" ON) - CMAKE_DEPENDENT_OPTION(CMAKE_USE_SYSTEM_NGHTTP2 "Use system-installed nghttp2" + cmake_dependent_option(CMAKE_USE_SYSTEM_NGHTTP2 "Use system-installed nghttp2" "${CMAKE_USE_SYSTEM_LIBRARY_NGHTTP2}" "NOT CMAKE_USE_SYSTEM_CURL" ON) option(CMAKE_USE_SYSTEM_FORM "Use system-installed libform" "${CMAKE_USE_SYSTEM_LIBRARY_FORM}") - CMAKE_DEPENDENT_OPTION(CMAKE_USE_SYSTEM_JSONCPP "Use system-installed jsoncpp" + cmake_dependent_option(CMAKE_USE_SYSTEM_JSONCPP "Use system-installed jsoncpp" "${CMAKE_USE_SYSTEM_LIBRARY_JSONCPP}" "NOT CMAKE_USE_SYSTEM_CPPDAP" ON) option(CMAKE_USE_SYSTEM_LIBRHASH "Use system-installed librhash" "${CMAKE_USE_SYSTEM_LIBRARY_LIBRHASH}") option(CMAKE_USE_SYSTEM_LIBUV "Use system-installed libuv" "${CMAKE_USE_SYSTEM_LIBRARY_LIBUV}") @@ -414,8 +414,8 @@ if(NOT CMake_TEST_EXTERNAL_CMAKE) set(HAVE_ENVIRON_NOT_REQUIRE_PROTOTYPE 1) else() include(CheckSymbolExists) - CHECK_SYMBOL_EXISTS(unsetenv "stdlib.h" HAVE_UNSETENV) - CHECK_SYMBOL_EXISTS(environ "stdlib.h" HAVE_ENVIRON_NOT_REQUIRE_PROTOTYPE) + check_symbol_exists(unsetenv "stdlib.h" HAVE_UNSETENV) + check_symbol_exists(environ "stdlib.h" HAVE_ENVIRON_NOT_REQUIRE_PROTOTYPE) endif() endif() diff --git a/Help/command/find_package.rst b/Help/command/find_package.rst index 6ad520281c..788b1bf418 100644 --- a/Help/command/find_package.rst +++ b/Help/command/find_package.rst @@ -602,8 +602,8 @@ one can set .. code-block:: cmake - SET(CMAKE_FIND_PACKAGE_SORT_ORDER NATURAL) - SET(CMAKE_FIND_PACKAGE_SORT_DIRECTION DEC) + set(CMAKE_FIND_PACKAGE_SORT_ORDER NATURAL) + set(CMAKE_FIND_PACKAGE_SORT_DIRECTION DEC) before calling ``find_package``. diff --git a/Help/command/install.rst b/Help/command/install.rst index 55ec7e3ba4..f3262a03e2 100644 --- a/Help/command/install.rst +++ b/Help/command/install.rst @@ -788,7 +788,7 @@ Signatures .. code-block:: cmake - install(CODE "MESSAGE(\"Sample install message.\")") + install(CODE "message(\"Sample install message.\")") will print a message during installation. diff --git a/Help/guide/importing-exporting/index.rst b/Help/guide/importing-exporting/index.rst index 91c50ddf97..89b8554221 100644 --- a/Help/guide/importing-exporting/index.rst +++ b/Help/guide/importing-exporting/index.rst @@ -390,7 +390,7 @@ section. :start-after: # create config file :end-before: # install config files -Install the generated configuration files with the :command:`INSTALL(files)` +Install the generated configuration files with the :command:`install(FILES)` command. Both ``MathFunctionsConfigVersion.cmake`` and ``MathFunctionsConfig.cmake`` are installed to the same location, completing the package. diff --git a/Help/release/3.11.rst b/Help/release/3.11.rst index 63b890fa01..c2c15ebef6 100644 --- a/Help/release/3.11.rst +++ b/Help/release/3.11.rst @@ -127,7 +127,7 @@ Properties Modules ------- -* The :module:`CheckIncludeFiles` module :command:`CHECK_INCLUDE_FILES` +* The :module:`CheckIncludeFiles` module :command:`check_include_files` command gained a ``LANGUAGE`` option to specify whether to check using the ``C`` or ``CXX`` compiler. diff --git a/Help/release/3.3.rst b/Help/release/3.3.rst index 2dc237f55e..efb6a7cc6e 100644 --- a/Help/release/3.3.rst +++ b/Help/release/3.3.rst @@ -135,7 +135,7 @@ Modules documentation, and unit tests. * The :module:`FindPackageHandleStandardArgs` module - ``FIND_PACKAGE_HANDLE_STANDARD_ARGS`` function now + ``find_package_handle_standard_args`` function now always populates both the ``_FOUND`` and ``_FOUND`` variables (the latter for backwards compatibility). The ``FOUND_VAR`` diff --git a/Modules/AndroidTestUtilities/PushToAndroidDevice.cmake b/Modules/AndroidTestUtilities/PushToAndroidDevice.cmake index 4c6e9fd68d..306181ded9 100644 --- a/Modules/AndroidTestUtilities/PushToAndroidDevice.cmake +++ b/Modules/AndroidTestUtilities/PushToAndroidDevice.cmake @@ -82,7 +82,7 @@ function(android_push_test_files_to_device) # dev_object_store : absolute path to the device object store directory. # link_origin : absolute path to the origin of the link to the dev obj store data file. function(push_and_link data_path dev_object_store link_origin) - FILE(SHA1 ${data_path} hash_val) + file(SHA1 ${data_path} hash_val) set(obj_store_dst ${dev_object_store}/${hash_val}) check_device_file_exists(${obj_store_dst} obj_store_file_exists) # TODO: Verify that the object store file is indeed hashed correctly. Could use md5. @@ -95,7 +95,7 @@ function(android_push_test_files_to_device) endif() foreach(ex ${arg_no_link_regex}) filename_regex(${data_path} ${ex}) - LIST(APPEND match_ex ${filename_match}) + list(APPEND match_ex ${filename_match}) endforeach() if(match_ex) execute_adb_command(shell cp ${obj_store_dst} ${link_origin}) diff --git a/Modules/CMakeAddNewLanguage.txt b/Modules/CMakeAddNewLanguage.txt index 011195c4be..a911289306 100644 --- a/Modules/CMakeAddNewLanguage.txt +++ b/Modules/CMakeAddNewLanguage.txt @@ -30,7 +30,7 @@ CMake(LANG)Information.cmake => set compiler configuration: CMAKE_(LANG)_USE_LINKER_INFORMATION CMakeTest(LANG)Compiler.cmake -> test the compiler and set: - SET(CMAKE_(LANG)_COMPILER_WORKS 1 CACHE INTERNAL "") + set(CMAKE_(LANG)_COMPILER_WORKS 1 CACHE INTERNAL "") If the variable CMAKE_(LANG)_USE_LINKER_INFORMATION has value TRUE, the file CMake(LANG)LinkerInformation.cmake diff --git a/Modules/CMakeBackwardCompatibilityC.cmake b/Modules/CMakeBackwardCompatibilityC.cmake index ef06a2d594..13d75e99a8 100644 --- a/Modules/CMakeBackwardCompatibilityC.cmake +++ b/Modules/CMakeBackwardCompatibilityC.cmake @@ -15,24 +15,24 @@ if(NOT CMAKE_SKIP_COMPATIBILITY_TESTS) endif() include (CheckTypeSize) - CHECK_TYPE_SIZE(int CMAKE_SIZEOF_INT) - CHECK_TYPE_SIZE(long CMAKE_SIZEOF_LONG) - CHECK_TYPE_SIZE("void*" CMAKE_SIZEOF_VOID_P) - CHECK_TYPE_SIZE(char CMAKE_SIZEOF_CHAR) - CHECK_TYPE_SIZE(short CMAKE_SIZEOF_SHORT) - CHECK_TYPE_SIZE(float CMAKE_SIZEOF_FLOAT) - CHECK_TYPE_SIZE(double CMAKE_SIZEOF_DOUBLE) + check_type_size(int CMAKE_SIZEOF_INT) + check_type_size(long CMAKE_SIZEOF_LONG) + check_type_size("void*" CMAKE_SIZEOF_VOID_P) + check_type_size(char CMAKE_SIZEOF_CHAR) + check_type_size(short CMAKE_SIZEOF_SHORT) + check_type_size(float CMAKE_SIZEOF_FLOAT) + check_type_size(double CMAKE_SIZEOF_DOUBLE) include (CheckIncludeFile) - CHECK_INCLUDE_FILE("limits.h" CMAKE_HAVE_LIMITS_H) - CHECK_INCLUDE_FILE("unistd.h" CMAKE_HAVE_UNISTD_H) - CHECK_INCLUDE_FILE("pthread.h" CMAKE_HAVE_PTHREAD_H) + check_include_file("limits.h" CMAKE_HAVE_LIMITS_H) + check_include_file("unistd.h" CMAKE_HAVE_UNISTD_H) + check_include_file("pthread.h" CMAKE_HAVE_PTHREAD_H) include (CheckIncludeFiles) - CHECK_INCLUDE_FILES("sys/types.h;sys/prctl.h" CMAKE_HAVE_SYS_PRCTL_H) + check_include_files("sys/types.h;sys/prctl.h" CMAKE_HAVE_SYS_PRCTL_H) include (TestBigEndian) - TEST_BIG_ENDIAN(CMAKE_WORDS_BIGENDIAN) + test_big_endian(CMAKE_WORDS_BIGENDIAN) include (FindX11) if("${X11_X11_INCLUDE_PATH}" STREQUAL "/usr/include") diff --git a/Modules/CheckStructHasMember.cmake b/Modules/CheckStructHasMember.cmake index 4ced2482af..cb129943f1 100644 --- a/Modules/CheckStructHasMember.cmake +++ b/Modules/CheckStructHasMember.cmake @@ -82,9 +82,9 @@ int main(void) ") if("${_lang}" STREQUAL "C") - CHECK_SOURCE_COMPILES(C "${_CHECK_STRUCT_MEMBER_SOURCE_CODE}" ${_RESULT}) + check_source_compiles(C "${_CHECK_STRUCT_MEMBER_SOURCE_CODE}" ${_RESULT}) elseif("${_lang}" STREQUAL "CXX") - CHECK_SOURCE_COMPILES(CXX "${_CHECK_STRUCT_MEMBER_SOURCE_CODE}" ${_RESULT}) + check_source_compiles(CXX "${_CHECK_STRUCT_MEMBER_SOURCE_CODE}" ${_RESULT}) else() message(FATAL_ERROR "Unknown language:\n ${_lang}\nSupported languages: C, CXX.\n") endif() diff --git a/Modules/FeatureSummary.cmake b/Modules/FeatureSummary.cmake index 0e12e05368..16839c91f9 100644 --- a/Modules/FeatureSummary.cmake +++ b/Modules/FeatureSummary.cmake @@ -358,7 +358,7 @@ endfunction() #]=======================================================================] function(FEATURE_SUMMARY) -# CMAKE_PARSE_ARGUMENTS( args...) +# cmake_parse_arguments( args...) set(options APPEND INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES @@ -369,7 +369,7 @@ function(FEATURE_SUMMARY) DESCRIPTION) set(multiValueArgs WHAT) - CMAKE_PARSE_ARGUMENTS(_FS "${options}" "${oneValueArgs}" "${multiValueArgs}" ${_FIRST_ARG} ${ARGN}) + cmake_parse_arguments(_FS "${options}" "${oneValueArgs}" "${multiValueArgs}" ${_FIRST_ARG} ${ARGN}) if(_FS_UNPARSED_ARGUMENTS) message(FATAL_ERROR "Unknown keywords given to FEATURE_SUMMARY(): \"${_FS_UNPARSED_ARGUMENTS}\"") @@ -594,7 +594,7 @@ function(SET_PACKAGE_PROPERTIES _name _props) set(oneValueArgs DESCRIPTION URL TYPE PURPOSE ) set(multiValueArgs ) # none - CMAKE_PARSE_ARGUMENTS(_SPP "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) + cmake_parse_arguments(_SPP "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) if(_SPP_UNPARSED_ARGUMENTS) message(FATAL_ERROR "Unknown keywords given to SET_PACKAGE_PROPERTIES(): \"${_SPP_UNPARSED_ARGUMENTS}\"") @@ -813,7 +813,7 @@ endfunction() #]=======================================================================] function(SET_FEATURE_INFO) message(DEPRECATION "SET_FEATURE_INFO is deprecated. Use ADD_FEATURE_INFO instead.") - SET_PACKAGE_INFO(${ARGN}) + set_package_info(${ARGN}) endfunction() #[=======================================================================[.rst: @@ -834,7 +834,7 @@ endfunction() function(PRINT_ENABLED_FEATURES) message(DEPRECATION "PRINT_ENABLED_FEATURES is deprecated. Use feature_summary(WHAT ENABLED_FEATURES DESCRIPTION \"Enabled features:\")") - FEATURE_SUMMARY(WHAT ENABLED_FEATURES DESCRIPTION "Enabled features:") + feature_summary(WHAT ENABLED_FEATURES DESCRIPTION "Enabled features:") endfunction() #[=======================================================================[.rst: @@ -855,5 +855,5 @@ endfunction() function(PRINT_DISABLED_FEATURES) message(DEPRECATION "PRINT_DISABLED_FEATURES is deprecated. Use feature_summary(WHAT DISABLED_FEATURES DESCRIPTION \"Disabled features:\")") - FEATURE_SUMMARY(WHAT DISABLED_FEATURES DESCRIPTION "Disabled features:") + feature_summary(WHAT DISABLED_FEATURES DESCRIPTION "Disabled features:") endfunction() diff --git a/Modules/FindALSA.cmake b/Modules/FindALSA.cmake index e332c14d89..0143b07d6e 100644 --- a/Modules/FindALSA.cmake +++ b/Modules/FindALSA.cmake @@ -62,7 +62,7 @@ if(ALSA_INCLUDE_DIR AND EXISTS "${ALSA_INCLUDE_DIR}/alsa/version.h") endif() include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(ALSA +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 c2d29e295d..c750696300 100644 --- a/Modules/FindASPELL.cmake +++ b/Modules/FindASPELL.cmake @@ -27,6 +27,6 @@ find_program(ASPELL_EXECUTABLE find_library(ASPELL_LIBRARIES NAMES aspell aspell-15 libaspell-15 libaspell) include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(ASPELL DEFAULT_MSG ASPELL_LIBRARIES ASPELL_INCLUDE_DIR ASPELL_EXECUTABLE) +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 9763e1f644..0ab364b051 100644 --- a/Modules/FindAVIFile.cmake +++ b/Modules/FindAVIFile.cmake @@ -29,7 +29,7 @@ if (UNIX) endif () include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(AVIFile DEFAULT_MSG AVIFILE_INCLUDE_DIR AVIFILE_AVIPLAY_LIBRARY) +find_package_handle_standard_args(AVIFile DEFAULT_MSG AVIFILE_INCLUDE_DIR AVIFILE_AVIPLAY_LIBRARY) if (AVIFILE_FOUND) set(AVIFILE_LIBRARIES ${AVIFILE_AVIPLAY_LIBRARY}) diff --git a/Modules/FindBISON.cmake b/Modules/FindBISON.cmake index 761a503f7f..c5f67d75d3 100644 --- a/Modules/FindBISON.cmake +++ b/Modules/FindBISON.cmake @@ -379,5 +379,5 @@ if(BISON_EXECUTABLE) endif() include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(BISON REQUIRED_VARS BISON_EXECUTABLE +find_package_handle_standard_args(BISON REQUIRED_VARS BISON_EXECUTABLE VERSION_VAR BISON_VERSION) diff --git a/Modules/FindBZip2.cmake b/Modules/FindBZip2.cmake index a04251c91d..c40db41b69 100644 --- a/Modules/FindBZip2.cmake +++ b/Modules/FindBZip2.cmake @@ -73,7 +73,7 @@ if (NOT BZIP2_LIBRARIES) find_library(BZIP2_LIBRARY_DEBUG NAMES bz2d bzip2d libbz2d libbzip2d NAMES_PER_DIR ${_BZIP2_PATHS} PATH_SUFFIXES lib) include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake) - SELECT_LIBRARY_CONFIGURATIONS(BZIP2) + select_library_configurations(BZIP2) else () file(TO_CMAKE_PATH "${BZIP2_LIBRARIES}" BZIP2_LIBRARIES) endif () @@ -85,7 +85,7 @@ if (BZIP2_INCLUDE_DIR AND EXISTS "${BZIP2_INCLUDE_DIR}/bzlib.h") endif () include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(BZip2 +find_package_handle_standard_args(BZip2 REQUIRED_VARS BZIP2_LIBRARIES BZIP2_INCLUDE_DIR VERSION_VAR BZIP2_VERSION) @@ -97,7 +97,7 @@ if (BZIP2_FOUND) set(CMAKE_REQUIRED_QUIET ${BZip2_FIND_QUIETLY}) set(CMAKE_REQUIRED_INCLUDES ${BZIP2_INCLUDE_DIR}) set(CMAKE_REQUIRED_LIBRARIES ${BZIP2_LIBRARIES}) - CHECK_SYMBOL_EXISTS(BZ2_bzCompressInit "bzlib.h" BZIP2_NEED_PREFIX) + check_symbol_exists(BZ2_bzCompressInit "bzlib.h" BZIP2_NEED_PREFIX) cmake_pop_check_state() if(NOT TARGET BZip2::BZip2) diff --git a/Modules/FindBullet.cmake b/Modules/FindBullet.cmake index 6d6418521e..712e24520f 100644 --- a/Modules/FindBullet.cmake +++ b/Modules/FindBullet.cmake @@ -80,7 +80,7 @@ _FIND_BULLET_LIBRARY(BULLET_SOFTBODY_LIBRARY_DEBUG BulletSoftBody_Debug BulletS include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Bullet DEFAULT_MSG +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 953cc62eff..ed5baf5072 100644 --- a/Modules/FindCUDA.cmake +++ b/Modules/FindCUDA.cmake @@ -888,7 +888,7 @@ if(NOT CUDA_TOOLKIT_ROOT_DIR AND NOT CMAKE_CROSSCOMPILING) endif () if(CMAKE_CROSSCOMPILING) - SET (CUDA_TOOLKIT_ROOT $ENV{CUDA_TOOLKIT_ROOT}) + set(CUDA_TOOLKIT_ROOT $ENV{CUDA_TOOLKIT_ROOT}) if(CMAKE_SYSTEM_PROCESSOR STREQUAL "armv7-a") # Support for NVPACK set (CUDA_TOOLKIT_TARGET_NAMES "armv7-linux-androideabi") @@ -909,7 +909,7 @@ if(CMAKE_CROSSCOMPILING) foreach(CUDA_TOOLKIT_TARGET_NAME IN LISTS CUDA_TOOLKIT_TARGET_NAMES) if (EXISTS "${CUDA_TOOLKIT_ROOT}/targets/${CUDA_TOOLKIT_TARGET_NAME}") set(CUDA_TOOLKIT_TARGET_DIR "${CUDA_TOOLKIT_ROOT}/targets/${CUDA_TOOLKIT_TARGET_NAME}" CACHE PATH "CUDA Toolkit target location.") - SET (CUDA_TOOLKIT_ROOT_DIR ${CUDA_TOOLKIT_ROOT} CACHE PATH "Toolkit location." FORCE) + set(CUDA_TOOLKIT_ROOT_DIR ${CUDA_TOOLKIT_ROOT} CACHE PATH "Toolkit location." FORCE) mark_as_advanced(CUDA_TOOLKIT_TARGET_DIR) break() endif() @@ -929,7 +929,7 @@ else() macro( cuda_find_host_program ) find_program( ${ARGN} ) endmacro() - SET (CUDA_TOOLKIT_TARGET_DIR ${CUDA_TOOLKIT_ROOT_DIR}) + set(CUDA_TOOLKIT_TARGET_DIR ${CUDA_TOOLKIT_ROOT_DIR}) endif() @@ -1561,7 +1561,7 @@ macro(CUDA_WRAP_SRCS cuda_target format generated_files) set(CUDA_NVCC_COMPILE_DEFINITIONS "${_dir_compile_defs}") else() # Append the include directories for this target via generator expression, which is - # expanded by the FILE(GENERATE) call below. This generator expression captures all + # expanded by the file(GENERATE) call below. This generator expression captures all # include dirs set by the user, whether via directory properties or target properties list(APPEND CUDA_NVCC_INCLUDE_DIRS "$") diff --git a/Modules/FindCUDA/select_compute_arch.cmake b/Modules/FindCUDA/select_compute_arch.cmake index 5fad33703d..f213c1a327 100644 --- a/Modules/FindCUDA/select_compute_arch.cmake +++ b/Modules/FindCUDA/select_compute_arch.cmake @@ -12,7 +12,7 @@ # Additionally, sets ${out_variable}_readable to the resulting numeric list # Example: # CUDA_SELECT_NVCC_ARCH_FLAGS(ARCH_FLAGS 3.0 3.5+PTX 5.2(5.0) Maxwell) -# LIST(APPEND CUDA_NVCC_FLAGS ${ARCH_FLAGS}) +# list(APPEND CUDA_NVCC_FLAGS ${ARCH_FLAGS}) # # More info on CUDA architectures: https://en.wikipedia.org/wiki/CUDA # diff --git a/Modules/FindCoin3D.cmake b/Modules/FindCoin3D.cmake index 5910ad1e47..4be0eef1a5 100644 --- a/Modules/FindCoin3D.cmake +++ b/Modules/FindCoin3D.cmake @@ -72,6 +72,6 @@ else () endif () include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Coin3D DEFAULT_MSG COIN3D_LIBRARIES COIN3D_INCLUDE_DIRS) +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 ceed009dd8..d76697c940 100644 --- a/Modules/FindCups.cmake +++ b/Modules/FindCups.cmake @@ -55,7 +55,7 @@ if (CUPS_INCLUDE_DIR AND CUPS_LIBRARIES AND CUPS_REQUIRE_IPP_DELETE_ATTRIBUTE) set(CMAKE_REQUIRED_QUIET ${Cups_FIND_QUIETLY}) # ippDeleteAttribute is new in cups-1.1.19 (and used by kdeprint) - CHECK_LIBRARY_EXISTS(cups ippDeleteAttribute "" CUPS_HAS_IPP_DELETE_ATTRIBUTE) + check_library_exists(cups ippDeleteAttribute "" CUPS_HAS_IPP_DELETE_ATTRIBUTE) cmake_pop_check_state() endif () @@ -81,11 +81,11 @@ endif () include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) if (CUPS_REQUIRE_IPP_DELETE_ATTRIBUTE) - FIND_PACKAGE_HANDLE_STANDARD_ARGS(Cups + find_package_handle_standard_args(Cups REQUIRED_VARS CUPS_LIBRARIES CUPS_INCLUDE_DIR CUPS_HAS_IPP_DELETE_ATTRIBUTE VERSION_VAR CUPS_VERSION_STRING) else () - FIND_PACKAGE_HANDLE_STANDARD_ARGS(Cups + find_package_handle_standard_args(Cups REQUIRED_VARS CUPS_LIBRARIES CUPS_INCLUDE_DIR VERSION_VAR CUPS_VERSION_STRING) endif () diff --git a/Modules/FindCurses.cmake b/Modules/FindCurses.cmake index bfa1d6fb44..58feccf9c6 100644 --- a/Modules/FindCurses.cmake +++ b/Modules/FindCurses.cmake @@ -104,11 +104,11 @@ if(CURSES_CURSES_LIBRARY AND CURSES_NEED_NCURSES) include(${CMAKE_CURRENT_LIST_DIR}/CMakePushCheckState.cmake) cmake_push_check_state() set(CMAKE_REQUIRED_QUIET ${Curses_FIND_QUIETLY}) - CHECK_LIBRARY_EXISTS("${CURSES_CURSES_LIBRARY}" + check_library_exists("${CURSES_CURSES_LIBRARY}" wsyncup "" CURSES_CURSES_HAS_WSYNCUP) if(CURSES_NCURSES_LIBRARY AND NOT CURSES_CURSES_HAS_WSYNCUP) - CHECK_LIBRARY_EXISTS("${CURSES_NCURSES_LIBRARY}" + check_library_exists("${CURSES_NCURSES_LIBRARY}" wsyncup "" CURSES_NCURSES_HAS_WSYNCUP) if( CURSES_NCURSES_HAS_WSYNCUP) set(CURSES_USE_NCURSES TRUE) @@ -158,9 +158,9 @@ if(CURSES_USE_NCURSES) set(CURSES_LIBRARY "${CURSES_NCURSES_LIBRARY}") endif() - CHECK_LIBRARY_EXISTS("${CURSES_NCURSES_LIBRARY}" + check_library_exists("${CURSES_NCURSES_LIBRARY}" cbreak "" CURSES_NCURSES_HAS_CBREAK) - CHECK_LIBRARY_EXISTS("${CURSES_NCURSES_LIBRARY}" + check_library_exists("${CURSES_NCURSES_LIBRARY}" nodelay "" CURSES_NCURSES_HAS_NODELAY) if(NOT CURSES_NCURSES_HAS_CBREAK OR NOT CURSES_NCURSES_HAS_NODELAY) find_library(CURSES_EXTRA_LIBRARY "${CURSES_TINFO_LIBRARY_NAME}" HINTS "${_cursesLibDir}") @@ -265,7 +265,7 @@ if(PKG_CONFIG_FOUND) endif() include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Curses DEFAULT_MSG +find_package_handle_standard_args(Curses DEFAULT_MSG CURSES_LIBRARY CURSES_INCLUDE_PATH) mark_as_advanced( diff --git a/Modules/FindCxxTest.cmake b/Modules/FindCxxTest.cmake index ceb6e29283..fcf96c6b8d 100644 --- a/Modules/FindCxxTest.cmake +++ b/Modules/FindCxxTest.cmake @@ -204,13 +204,13 @@ if(PYTHON_FOUND OR PERL_FOUND) else() set(CXXTEST_TESTGEN_INTERPRETER ${Python_EXECUTABLE}) endif() - FIND_PACKAGE_HANDLE_STANDARD_ARGS(CxxTest DEFAULT_MSG + find_package_handle_standard_args(CxxTest DEFAULT_MSG CXXTEST_INCLUDE_DIR CXXTEST_PYTHON_TESTGEN_EXECUTABLE) elseif(PERL_FOUND) set(CXXTEST_TESTGEN_EXECUTABLE ${CXXTEST_PERL_TESTGEN_EXECUTABLE}) set(CXXTEST_TESTGEN_INTERPRETER ${PERL_EXECUTABLE}) - FIND_PACKAGE_HANDLE_STANDARD_ARGS(CxxTest DEFAULT_MSG + find_package_handle_standard_args(CxxTest DEFAULT_MSG CXXTEST_INCLUDE_DIR CXXTEST_PERL_TESTGEN_EXECUTABLE) endif() diff --git a/Modules/FindDart.cmake b/Modules/FindDart.cmake index fed50e178c..7b4cefd784 100644 --- a/Modules/FindDart.cmake +++ b/Modules/FindDart.cmake @@ -36,6 +36,6 @@ find_path(DART_ROOT README.INSTALL ) include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Dart DEFAULT_MSG DART_ROOT) +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 611d761dc2..919860b12e 100644 --- a/Modules/FindDevIL.cmake +++ b/Modules/FindDevIL.cmake @@ -97,7 +97,7 @@ find_library(ILU_LIBRARIES #message("ILU_LIBRARIES is ${ILU_LIBRARIES}") -FIND_PACKAGE_HANDLE_STANDARD_ARGS(DevIL DEFAULT_MSG +find_package_handle_standard_args(DevIL DEFAULT_MSG IL_LIBRARIES ILU_LIBRARIES IL_INCLUDE_DIR) # provide legacy variable for compatibility diff --git a/Modules/FindEXPAT.cmake b/Modules/FindEXPAT.cmake index 825b7a61e3..93a597108f 100644 --- a/Modules/FindEXPAT.cmake +++ b/Modules/FindEXPAT.cmake @@ -139,7 +139,7 @@ if(EXPAT_INCLUDE_DIR AND EXISTS "${EXPAT_INCLUDE_DIR}/expat.h") endif() include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(EXPAT +find_package_handle_standard_args(EXPAT REQUIRED_VARS EXPAT_LIBRARY EXPAT_INCLUDE_DIR VERSION_VAR EXPAT_VERSION_STRING) diff --git a/Modules/FindFLEX.cmake b/Modules/FindFLEX.cmake index 171419871b..19827aa7b8 100644 --- a/Modules/FindFLEX.cmake +++ b/Modules/FindFLEX.cmake @@ -340,5 +340,5 @@ if(FLEX_EXECUTABLE) endif() include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(FLEX REQUIRED_VARS FLEX_EXECUTABLE +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 15f1ef54df..f234069675 100644 --- a/Modules/FindFLTK.cmake +++ b/Modules/FindFLTK.cmake @@ -324,9 +324,9 @@ list(APPEND FLTK_LIBRARIES ${FLTK_BASE_LIBRARY}) include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) if(FLTK_SKIP_FLUID) - FIND_PACKAGE_HANDLE_STANDARD_ARGS(FLTK DEFAULT_MSG FLTK_LIBRARIES FLTK_INCLUDE_DIR) + find_package_handle_standard_args(FLTK DEFAULT_MSG FLTK_LIBRARIES FLTK_INCLUDE_DIR) else() - FIND_PACKAGE_HANDLE_STANDARD_ARGS(FLTK DEFAULT_MSG FLTK_LIBRARIES FLTK_INCLUDE_DIR FLTK_FLUID_EXECUTABLE) + find_package_handle_standard_args(FLTK DEFAULT_MSG FLTK_LIBRARIES FLTK_INCLUDE_DIR FLTK_FLUID_EXECUTABLE) endif() if(FLTK_FOUND) diff --git a/Modules/FindGDAL.cmake b/Modules/FindGDAL.cmake index 0379af7e3e..739b79c052 100644 --- a/Modules/FindGDAL.cmake +++ b/Modules/FindGDAL.cmake @@ -203,7 +203,7 @@ if (GDAL_FIND_VERSION VERSION_GREATER_EQUAL 3.5) endif() include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(GDAL +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 11fa3c89c4..aa9432283c 100644 --- a/Modules/FindGIF.cmake +++ b/Modules/FindGIF.cmake @@ -93,7 +93,7 @@ if(GIF_INCLUDE_DIR) set(GIF_VERSION "${_GIF_MAJ}.${_GIF_MIN}.${_GIF_REL}") else() # use UserData field to sniff version instead - CHECK_STRUCT_HAS_MEMBER(GifFileType UserData gif_lib.h GIF_GifFileType_UserData ) + check_struct_has_member(GifFileType UserData gif_lib.h GIF_GifFileType_UserData ) if(GIF_GifFileType_UserData) set(GIF_VERSION 4) else() @@ -109,7 +109,7 @@ if(GIF_INCLUDE_DIR) endif() include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(GIF REQUIRED_VARS GIF_LIBRARY GIF_INCLUDE_DIR +find_package_handle_standard_args(GIF REQUIRED_VARS GIF_LIBRARY GIF_INCLUDE_DIR VERSION_VAR GIF_VERSION ) if(GIF_FOUND) diff --git a/Modules/FindGLUT.cmake b/Modules/FindGLUT.cmake index 613d31565c..471e3aaee1 100644 --- a/Modules/FindGLUT.cmake +++ b/Modules/FindGLUT.cmake @@ -165,7 +165,7 @@ else() unset(_GLUT_glut_LIB_DIR) endif() -FIND_PACKAGE_HANDLE_STANDARD_ARGS(GLUT REQUIRED_VARS GLUT_glut_LIBRARY GLUT_INCLUDE_DIR) +find_package_handle_standard_args(GLUT REQUIRED_VARS GLUT_glut_LIBRARY GLUT_INCLUDE_DIR) if (GLUT_FOUND) # Is -lXi and -lXmu required on all platforms that have it? diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake index f91d2fd9df..2017b0f05f 100644 --- a/Modules/FindGTK2.cmake +++ b/Modules/FindGTK2.cmake @@ -924,7 +924,7 @@ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS}) set(FPHSA_NAME_MISMATCHED 1) if(_GTK2_component STREQUAL "gtk") - FIND_PACKAGE_HANDLE_STANDARD_ARGS(GTK2_${_COMPONENT_UPPER} "Some or all of the gtk libraries were not found." + find_package_handle_standard_args(GTK2_${_COMPONENT_UPPER} "Some or all of the gtk libraries were not found." GTK2_GTK_LIBRARY GTK2_GTK_INCLUDE_DIR @@ -937,7 +937,7 @@ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS}) GTK2_GLIB_LIBRARY ) elseif(_GTK2_component STREQUAL "gtkmm") - FIND_PACKAGE_HANDLE_STANDARD_ARGS(GTK2_${_COMPONENT_UPPER} "Some or all of the gtkmm libraries were not found." + find_package_handle_standard_args(GTK2_${_COMPONENT_UPPER} "Some or all of the gtkmm libraries were not found." GTK2_GTKMM_LIBRARY GTK2_GTKMM_INCLUDE_DIR GTK2_GTKMMCONFIG_INCLUDE_DIR @@ -954,12 +954,12 @@ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS}) FREETYPE_INCLUDE_DIR_freetype2 ) elseif(_GTK2_component STREQUAL "glade") - FIND_PACKAGE_HANDLE_STANDARD_ARGS(GTK2_${_COMPONENT_UPPER} "The glade library was not found." + find_package_handle_standard_args(GTK2_${_COMPONENT_UPPER} "The glade library was not found." GTK2_GLADE_LIBRARY GTK2_GLADE_INCLUDE_DIR ) elseif(_GTK2_component STREQUAL "glademm") - FIND_PACKAGE_HANDLE_STANDARD_ARGS(GTK2_${_COMPONENT_UPPER} "The glademm library was not found." + find_package_handle_standard_args(GTK2_${_COMPONENT_UPPER} "The glademm library was not found." GTK2_GLADEMM_LIBRARY GTK2_GLADEMM_INCLUDE_DIR GTK2_GLADEMMCONFIG_INCLUDE_DIR diff --git a/Modules/FindGTest.cmake b/Modules/FindGTest.cmake index c2128a9611..3da760d4a2 100644 --- a/Modules/FindGTest.cmake +++ b/Modules/FindGTest.cmake @@ -199,7 +199,7 @@ find_package(GTest QUIET NO_MODULE) # if we found the GTest cmake package then we are done, and # can print what we found and return. if(GTest_FOUND) - FIND_PACKAGE_HANDLE_STANDARD_ARGS(GTest HANDLE_COMPONENTS CONFIG_MODE) + find_package_handle_standard_args(GTest HANDLE_COMPONENTS CONFIG_MODE) set(GTEST_LIBRARIES GTest::gtest) set(GTEST_MAIN_LIBRARIES GTest::gtest_main) @@ -270,7 +270,7 @@ else() __gtest_find_library(GMOCK_MAIN_LIBRARY_DEBUG gmock_maind) endif() -FIND_PACKAGE_HANDLE_STANDARD_ARGS(GTest DEFAULT_MSG GTEST_LIBRARY GTEST_INCLUDE_DIR GTEST_MAIN_LIBRARY) +find_package_handle_standard_args(GTest DEFAULT_MSG GTEST_LIBRARY GTEST_INCLUDE_DIR GTEST_MAIN_LIBRARY) if(GMOCK_LIBRARY AND GMOCK_MAIN_LIBRARY) set(GMock_FOUND True) diff --git a/Modules/FindGettext.cmake b/Modules/FindGettext.cmake index 99e2887e98..ac7b925dc1 100644 --- a/Modules/FindGettext.cmake +++ b/Modules/FindGettext.cmake @@ -78,7 +78,7 @@ if(GETTEXT_MSGMERGE_EXECUTABLE) endif() include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Gettext +find_package_handle_standard_args(Gettext REQUIRED_VARS GETTEXT_MSGMERGE_EXECUTABLE GETTEXT_MSGFMT_EXECUTABLE VERSION_VAR GETTEXT_VERSION_STRING) @@ -145,7 +145,7 @@ function(GETTEXT_PROCESS_POT_FILE _potFile) set(_oneValueArgs INSTALL_DESTINATION) set(_multiValueArgs LANGUAGES) - CMAKE_PARSE_ARGUMENTS(_parsedArguments "${_options}" "${_oneValueArgs}" "${_multiValueArgs}" ${ARGN}) + cmake_parse_arguments(_parsedArguments "${_options}" "${_oneValueArgs}" "${_multiValueArgs}" ${ARGN}) get_filename_component(_potName ${_potFile} NAME) string(REGEX REPLACE "^(.+)(\\.[^.]+)$" "\\1" _potBasename ${_potName}) @@ -196,7 +196,7 @@ function(GETTEXT_PROCESS_PO_FILES _lang) set(_multiValueArgs PO_FILES) set(_gmoFiles) - CMAKE_PARSE_ARGUMENTS(_parsedArguments "${_options}" "${_oneValueArgs}" "${_multiValueArgs}" ${ARGN}) + cmake_parse_arguments(_parsedArguments "${_options}" "${_oneValueArgs}" "${_multiValueArgs}" ${ARGN}) foreach(_current_PO_FILE ${_parsedArguments_PO_FILES}) get_filename_component(_name ${_current_PO_FILE} NAME) diff --git a/Modules/FindGnuTLS.cmake b/Modules/FindGnuTLS.cmake index e4c42f3bc0..5cc832a791 100644 --- a/Modules/FindGnuTLS.cmake +++ b/Modules/FindGnuTLS.cmake @@ -44,7 +44,7 @@ if (NOT WIN32) # also fills in GNUTLS_DEFINITIONS, although that isn't normally useful find_package(PkgConfig QUIET) if(PKG_CONFIG_FOUND) - PKG_CHECK_MODULES(PC_GNUTLS QUIET gnutls) + pkg_check_modules(PC_GNUTLS QUIET gnutls) endif() set(GNUTLS_DEFINITIONS ${PC_GNUTLS_CFLAGS_OTHER}) set(GNUTLS_VERSION ${PC_GNUTLS_VERSION}) @@ -67,7 +67,7 @@ find_library(GNUTLS_LIBRARY NAMES gnutls libgnutls mark_as_advanced(GNUTLS_INCLUDE_DIR GNUTLS_LIBRARY) include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(GnuTLS +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 b4ea6ab3f3..6f9fb81e24 100644 --- a/Modules/FindGnuplot.cmake +++ b/Modules/FindGnuplot.cmake @@ -50,7 +50,7 @@ endif() set(GNUPLOT ${GNUPLOT_EXECUTABLE}) include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Gnuplot +find_package_handle_standard_args(Gnuplot REQUIRED_VARS GNUPLOT_EXECUTABLE VERSION_VAR GNUPLOT_VERSION_STRING) diff --git a/Modules/FindHSPELL.cmake b/Modules/FindHSPELL.cmake index ca09444325..80a2c2edca 100644 --- a/Modules/FindHSPELL.cmake +++ b/Modules/FindHSPELL.cmake @@ -41,7 +41,7 @@ if (HSPELL_INCLUDE_DIR) endif() include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(HSPELL +find_package_handle_standard_args(HSPELL REQUIRED_VARS HSPELL_LIBRARIES HSPELL_INCLUDE_DIR VERSION_VAR HSPELL_VERSION_STRING) diff --git a/Modules/FindIce.cmake b/Modules/FindIce.cmake index f2b4d5a18d..cac4eadf4f 100644 --- a/Modules/FindIce.cmake +++ b/Modules/FindIce.cmake @@ -541,7 +541,7 @@ endfunction() _Ice_FIND() include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Ice +find_package_handle_standard_args(Ice REQUIRED_VARS Ice_SLICE2CPP_EXECUTABLE Ice_INCLUDE_DIR Ice_SLICE_DIR diff --git a/Modules/FindIcotool.cmake b/Modules/FindIcotool.cmake index d19c145799..4d23f5b747 100644 --- a/Modules/FindIcotool.cmake +++ b/Modules/FindIcotool.cmake @@ -41,7 +41,7 @@ if(ICOTOOL_EXECUTABLE) endif() include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS( +find_package_handle_standard_args( Icotool REQUIRED_VARS ICOTOOL_EXECUTABLE VERSION_VAR ICOTOOL_VERSION_STRING diff --git a/Modules/FindImageMagick.cmake b/Modules/FindImageMagick.cmake index 7b0671f119..6cab3ab58c 100644 --- a/Modules/FindImageMagick.cmake +++ b/Modules/FindImageMagick.cmake @@ -323,7 +323,7 @@ endif() # Standard Package Output #--------------------------------------------------------------------- include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(ImageMagick +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 e2c5a838e9..b89ed7884f 100644 --- a/Modules/FindIntl.cmake +++ b/Modules/FindIntl.cmake @@ -161,7 +161,7 @@ if(Intl_INCLUDE_DIR AND EXISTS "${Intl_INCLUDE_DIR}/libintl.h") endif() include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Intl +find_package_handle_standard_args(Intl REQUIRED_VARS ${_Intl_REQUIRED_VARS} VERSION_VAR Intl_VERSION FAIL_MESSAGE "Failed to find Gettext libintl") diff --git a/Modules/FindLibLZMA.cmake b/Modules/FindLibLZMA.cmake index 7b0c530cd2..6e29bd9ec5 100644 --- a/Modules/FindLibLZMA.cmake +++ b/Modules/FindLibLZMA.cmake @@ -97,9 +97,9 @@ if (LIBLZMA_LIBRARY) elseif(LIBLZMA_LIBRARY_DEBUG) set(LIBLZMA_LIBRARY_check ${LIBLZMA_LIBRARY_DEBUG}) endif() - CHECK_LIBRARY_EXISTS(${LIBLZMA_LIBRARY_check} lzma_auto_decoder "" LIBLZMA_HAS_AUTO_DECODER) - CHECK_LIBRARY_EXISTS(${LIBLZMA_LIBRARY_check} lzma_easy_encoder "" LIBLZMA_HAS_EASY_ENCODER) - CHECK_LIBRARY_EXISTS(${LIBLZMA_LIBRARY_check} lzma_lzma_preset "" LIBLZMA_HAS_LZMA_PRESET) + check_library_exists(${LIBLZMA_LIBRARY_check} lzma_auto_decoder "" LIBLZMA_HAS_AUTO_DECODER) + check_library_exists(${LIBLZMA_LIBRARY_check} lzma_easy_encoder "" LIBLZMA_HAS_EASY_ENCODER) + check_library_exists(${LIBLZMA_LIBRARY_check} lzma_lzma_preset "" LIBLZMA_HAS_LZMA_PRESET) unset(LIBLZMA_LIBRARY_check) set(CMAKE_REQUIRED_QUIET ${CMAKE_REQUIRED_QUIET_SAVE}) endif () diff --git a/Modules/FindLibXml2.cmake b/Modules/FindLibXml2.cmake index cc2d630b9c..c68306d569 100644 --- a/Modules/FindLibXml2.cmake +++ b/Modules/FindLibXml2.cmake @@ -59,7 +59,7 @@ cmake_policy(SET CMP0159 NEW) # file(STRINGS) with REGEX updates CMAKE_MATCH_ # in the find_path() and find_library() calls find_package(PkgConfig QUIET) if(PKG_CONFIG_FOUND) - PKG_CHECK_MODULES(PC_LIBXML QUIET libxml-2.0) + pkg_check_modules(PC_LIBXML QUIET libxml-2.0) endif() find_path(LIBXML2_INCLUDE_DIR NAMES libxml/xpath.h @@ -110,7 +110,7 @@ foreach(libxml2_pc_lib_dir IN LISTS PC_LIBXML_LIBDIR PC_LIBXML_LIBRARY_DIRS) endforeach() include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibXml2 +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 11d12cb9a3..5f9c4c83b4 100644 --- a/Modules/FindLibXslt.cmake +++ b/Modules/FindLibXslt.cmake @@ -52,7 +52,7 @@ cmake_policy(SET CMP0159 NEW) # file(STRINGS) with REGEX updates CMAKE_MATCH_ # in the find_path() and find_library() calls find_package(PkgConfig QUIET) if(PKG_CONFIG_FOUND) - PKG_CHECK_MODULES(PC_LIBXSLT QUIET libxslt) + pkg_check_modules(PC_LIBXSLT QUIET libxslt) endif() set(LIBXSLT_DEFINITIONS ${PC_LIBXSLT_CFLAGS_OTHER}) @@ -78,7 +78,7 @@ find_library(LIBXSLT_LIBRARY NAMES xslt libxslt set(LIBXSLT_LIBRARIES ${LIBXSLT_LIBRARY}) if(PKG_CONFIG_FOUND) - PKG_CHECK_MODULES(PC_LIBXSLT_EXSLT QUIET libexslt) + pkg_check_modules(PC_LIBXSLT_EXSLT QUIET libexslt) endif() set(LIBXSLT_EXSLT_DEFINITIONS ${PC_LIBXSLT_EXSLT_CFLAGS_OTHER}) @@ -112,7 +112,7 @@ elseif(LIBXSLT_INCLUDE_DIR AND EXISTS "${LIBXSLT_INCLUDE_DIR}/libxslt/xsltconfig endif() include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibXslt +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 78fe83c7f2..1661a7af86 100644 --- a/Modules/FindLua.cmake +++ b/Modules/FindLua.cmake @@ -233,7 +233,7 @@ endif () include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) # handle the QUIETLY and REQUIRED arguments and set LUA_FOUND to TRUE if # all listed variables are TRUE -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Lua +find_package_handle_standard_args(Lua REQUIRED_VARS LUA_LIBRARIES LUA_INCLUDE_DIR VERSION_VAR LUA_VERSION_STRING) diff --git a/Modules/FindLua50.cmake b/Modules/FindLua50.cmake index 6ba9008e92..b2062c9f2b 100644 --- a/Modules/FindLua50.cmake +++ b/Modules/FindLua50.cmake @@ -76,6 +76,6 @@ endif() include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) # 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) +find_package_handle_standard_args(Lua50 DEFAULT_MSG LUA_LIBRARIES LUA_INCLUDE_DIR) mark_as_advanced(LUA_INCLUDE_DIR LUA_LIBRARIES) diff --git a/Modules/FindLua51.cmake b/Modules/FindLua51.cmake index 2249ab14c4..a0fcec2cf3 100644 --- a/Modules/FindLua51.cmake +++ b/Modules/FindLua51.cmake @@ -71,7 +71,7 @@ endif() include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) # handle the QUIETLY and REQUIRED arguments and set LUA_FOUND to TRUE if # all listed variables are TRUE -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Lua51 +find_package_handle_standard_args(Lua51 REQUIRED_VARS LUA_LIBRARIES LUA_INCLUDE_DIR VERSION_VAR LUA_VERSION_STRING) diff --git a/Modules/FindMPEG.cmake b/Modules/FindMPEG.cmake index e5a80e3894..bd8139da2a 100644 --- a/Modules/FindMPEG.cmake +++ b/Modules/FindMPEG.cmake @@ -31,7 +31,7 @@ find_library(MPEG_mpeg2_LIBRARY mpeg2) find_library(MPEG_vo_LIBRARY vo) include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(MPEG DEFAULT_MSG MPEG_mpeg2_LIBRARY MPEG_INCLUDE_DIR) +find_package_handle_standard_args(MPEG DEFAULT_MSG MPEG_mpeg2_LIBRARY MPEG_INCLUDE_DIR) if(MPEG_FOUND) set( MPEG_LIBRARIES ${MPEG_mpeg2_LIBRARY} ) diff --git a/Modules/FindMPEG2.cmake b/Modules/FindMPEG2.cmake index 763d86a85e..85e798b64a 100644 --- a/Modules/FindMPEG2.cmake +++ b/Modules/FindMPEG2.cmake @@ -31,7 +31,7 @@ find_library(MPEG2_mpeg2_LIBRARY mpeg2) find_library(MPEG2_vo_LIBRARY vo) include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(MPEG2 DEFAULT_MSG MPEG2_mpeg2_LIBRARY MPEG2_INCLUDE_DIR) +find_package_handle_standard_args(MPEG2 DEFAULT_MSG MPEG2_mpeg2_LIBRARY MPEG2_INCLUDE_DIR) if(MPEG2_FOUND) set(MPEG2_LIBRARIES ${MPEG2_mpeg2_LIBRARY}) diff --git a/Modules/FindMotif.cmake b/Modules/FindMotif.cmake index 4f7080a44c..f4d09805a2 100644 --- a/Modules/FindMotif.cmake +++ b/Modules/FindMotif.cmake @@ -32,7 +32,7 @@ if(UNIX) endif() include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Motif DEFAULT_MSG MOTIF_LIBRARIES MOTIF_INCLUDE_DIR) +find_package_handle_standard_args(Motif DEFAULT_MSG MOTIF_LIBRARIES MOTIF_INCLUDE_DIR) mark_as_advanced( MOTIF_INCLUDE_DIR diff --git a/Modules/FindOpenCL.cmake b/Modules/FindOpenCL.cmake index c0f45df59d..7fc259ba0e 100644 --- a/Modules/FindOpenCL.cmake +++ b/Modules/FindOpenCL.cmake @@ -51,12 +51,12 @@ function(_FIND_OPENCL_VERSION) set(CMAKE_REQUIRED_INCLUDES "${OpenCL_INCLUDE_DIR}") if(EXISTS ${OpenCL_INCLUDE_DIR}/Headers/cl.h) - CHECK_SYMBOL_EXISTS( + check_symbol_exists( CL_VERSION_${VERSION} "${OpenCL_INCLUDE_DIR}/Headers/cl.h" OPENCL_VERSION_${VERSION}) else() - CHECK_SYMBOL_EXISTS( + check_symbol_exists( CL_VERSION_${VERSION} "${OpenCL_INCLUDE_DIR}/CL/cl.h" OPENCL_VERSION_${VERSION}) diff --git a/Modules/FindOpenGL.cmake b/Modules/FindOpenGL.cmake index 0c77cfcc1d..b85c13c587 100644 --- a/Modules/FindOpenGL.cmake +++ b/Modules/FindOpenGL.cmake @@ -576,7 +576,7 @@ if (CMAKE_FIND_PACKAGE_NAME STREQUAL "GLU") # the contents, detect the case in this module and suppress it explicitly. set(FPHSA_NAME_MISMATCHED 1) endif () -FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenGL REQUIRED_VARS ${_OpenGL_REQUIRED_VARS} +find_package_handle_standard_args(OpenGL REQUIRED_VARS ${_OpenGL_REQUIRED_VARS} HANDLE_COMPONENTS) unset(FPHSA_NAME_MISMATCHED) unset(_OpenGL_REQUIRED_VARS) diff --git a/Modules/FindOpenSceneGraph.cmake b/Modules/FindOpenSceneGraph.cmake index 9df2a62c95..3dec9166ae 100644 --- a/Modules/FindOpenSceneGraph.cmake +++ b/Modules/FindOpenSceneGraph.cmake @@ -226,7 +226,7 @@ if(OpenSceneGraph_FIND_REQUIRED) endif() include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenSceneGraph +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 6be3422532..5b5ca98f0a 100644 --- a/Modules/FindOpenThreads.cmake +++ b/Modules/FindOpenThreads.cmake @@ -105,5 +105,5 @@ find_library(OPENTHREADS_LIBRARY_DEBUG select_library_configurations(OPENTHREADS) include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenThreads DEFAULT_MSG +find_package_handle_standard_args(OpenThreads DEFAULT_MSG OPENTHREADS_LIBRARY OPENTHREADS_INCLUDE_DIR) diff --git a/Modules/FindPHP4.cmake b/Modules/FindPHP4.cmake index 34b4adb013..4b7c43fe2e 100644 --- a/Modules/FindPHP4.cmake +++ b/Modules/FindPHP4.cmake @@ -79,4 +79,4 @@ if(APPLE) endif() include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(PHP4 DEFAULT_MSG PHP4_EXECUTABLE PHP4_INCLUDE_PATH) +find_package_handle_standard_args(PHP4 DEFAULT_MSG PHP4_EXECUTABLE PHP4_INCLUDE_PATH) diff --git a/Modules/FindPerl.cmake b/Modules/FindPerl.cmake index 49bc54ccc4..3655b79bc0 100644 --- a/Modules/FindPerl.cmake +++ b/Modules/FindPerl.cmake @@ -86,7 +86,7 @@ if (CMAKE_FIND_PACKAGE_NAME STREQUAL "PerlLibs") # the contents, detect the case in this module and suppress it explicitly. set(FPHSA_NAME_MISMATCHED 1) endif () -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Perl +find_package_handle_standard_args(Perl REQUIRED_VARS PERL_EXECUTABLE VERSION_VAR PERL_VERSION_STRING) unset(FPHSA_NAME_MISMATCHED) diff --git a/Modules/FindPhysFS.cmake b/Modules/FindPhysFS.cmake index 19e5ba9195..21a7bca323 100644 --- a/Modules/FindPhysFS.cmake +++ b/Modules/FindPhysFS.cmake @@ -43,4 +43,4 @@ find_library(PHYSFS_LIBRARY ) include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(PhysFS DEFAULT_MSG PHYSFS_LIBRARY PHYSFS_INCLUDE_DIR) +find_package_handle_standard_args(PhysFS DEFAULT_MSG PHYSFS_LIBRARY PHYSFS_INCLUDE_DIR) diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake index acbab8d5bb..19a2320c93 100644 --- a/Modules/FindPkgConfig.cmake +++ b/Modules/FindPkgConfig.cmake @@ -974,7 +974,7 @@ endmacro() function (pkg_get_variable result pkg variable) set(_multiValueArgs DEFINE_VARIABLES) - CMAKE_PARSE_ARGUMENTS(_parsedArguments "" "" "${_multiValueArgs}" ${ARGN}) + cmake_parse_arguments(_parsedArguments "" "" "${_multiValueArgs}" ${ARGN}) set(defined_variables ) foreach(_def_var ${_parsedArguments_DEFINE_VARIABLES}) if(NOT _def_var MATCHES "^.+=.*$") diff --git a/Modules/FindProducer.cmake b/Modules/FindProducer.cmake index 8a16e8af2b..fba9912e84 100644 --- a/Modules/FindProducer.cmake +++ b/Modules/FindProducer.cmake @@ -66,5 +66,5 @@ find_library(PRODUCER_LIBRARY ) include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Producer DEFAULT_MSG +find_package_handle_standard_args(Producer DEFAULT_MSG PRODUCER_LIBRARY PRODUCER_INCLUDE_DIR) diff --git a/Modules/FindProtobuf.cmake b/Modules/FindProtobuf.cmake index c5a351291e..4f8b3e8d4b 100644 --- a/Modules/FindProtobuf.cmake +++ b/Modules/FindProtobuf.cmake @@ -800,7 +800,7 @@ if(Protobuf_INCLUDE_DIR) endif() include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Protobuf +find_package_handle_standard_args(Protobuf REQUIRED_VARS Protobuf_LIBRARIES Protobuf_INCLUDE_DIR VERSION_VAR Protobuf_VERSION ) diff --git a/Modules/FindPythonInterp.cmake b/Modules/FindPythonInterp.cmake index e5bcb5f5d1..9dd88baa9b 100644 --- a/Modules/FindPythonInterp.cmake +++ b/Modules/FindPythonInterp.cmake @@ -179,6 +179,6 @@ if(PYTHON_EXECUTABLE) endif() include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(PythonInterp REQUIRED_VARS PYTHON_EXECUTABLE VERSION_VAR PYTHON_VERSION_STRING) +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 6bf244e329..33b61d1aea 100644 --- a/Modules/FindPythonLibs.cmake +++ b/Modules/FindPythonLibs.cmake @@ -308,12 +308,12 @@ set(PYTHON_INCLUDE_DIRS "${PYTHON_INCLUDE_DIR}") set(PYTHON_DEBUG_LIBRARIES "${PYTHON_DEBUG_LIBRARY}") # These variables have been historically named in this module different from -# what SELECT_LIBRARY_CONFIGURATIONS() expects. +# what select_library_configurations() expects. set(PYTHON_LIBRARY_DEBUG "${PYTHON_DEBUG_LIBRARY}") set(PYTHON_LIBRARY_RELEASE "${PYTHON_LIBRARY}") include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake) -SELECT_LIBRARY_CONFIGURATIONS(PYTHON) -# SELECT_LIBRARY_CONFIGURATIONS() sets ${PREFIX}_FOUND if it has a library. +select_library_configurations(PYTHON) +# select_library_configurations() sets ${PREFIX}_FOUND if it has a library. # Unset this, this prefix doesn't match the module prefix, they are different # for historical reasons. unset(PYTHON_FOUND) @@ -327,7 +327,7 @@ else() endif() include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(PythonLibs +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 5a0037c24e..a6b9a447ac 100644 --- a/Modules/FindQt3.cmake +++ b/Modules/FindQt3.cmake @@ -214,7 +214,7 @@ if (CMAKE_FIND_PACKAGE_NAME STREQUAL "Qt") # contents, detect the case in this module and suppress it explicitly. set(FPHSA_NAME_MISMATCHED 1) endif () -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Qt3 +find_package_handle_standard_args(Qt3 REQUIRED_VARS QT_QT_LIBRARY QT_INCLUDE_DIR QT_MOC_EXECUTABLE VERSION_VAR QT_VERSION_STRING) unset(FPHSA_NAME_MISMATCHED) diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index 6e1ffbcd85..6608f2f62b 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake @@ -753,19 +753,19 @@ if (QT_QMAKE_EXECUTABLE AND list(APPEND CMAKE_REQUIRED_INCLUDES "${QT_INCLUDE_DIR}") set(CMAKE_REQUIRED_QUIET ${Qt4_FIND_QUIETLY}) # Check for Window system symbols (note: only one should end up being set) - CHECK_CXX_SYMBOL_EXISTS(Q_WS_X11 "QtCore/qglobal.h" Q_WS_X11) - CHECK_CXX_SYMBOL_EXISTS(Q_WS_WIN "QtCore/qglobal.h" Q_WS_WIN) - CHECK_CXX_SYMBOL_EXISTS(Q_WS_QWS "QtCore/qglobal.h" Q_WS_QWS) - CHECK_CXX_SYMBOL_EXISTS(Q_WS_MAC "QtCore/qglobal.h" Q_WS_MAC) + check_cxx_symbol_exists(Q_WS_X11 "QtCore/qglobal.h" Q_WS_X11) + check_cxx_symbol_exists(Q_WS_WIN "QtCore/qglobal.h" Q_WS_WIN) + check_cxx_symbol_exists(Q_WS_QWS "QtCore/qglobal.h" Q_WS_QWS) + check_cxx_symbol_exists(Q_WS_MAC "QtCore/qglobal.h" Q_WS_MAC) if(Q_WS_MAC) if(QT_QMAKE_CHANGED) unset(QT_MAC_USE_COCOA CACHE) endif() - CHECK_CXX_SYMBOL_EXISTS(QT_MAC_USE_COCOA "QtCore/qconfig.h" QT_MAC_USE_COCOA) + check_cxx_symbol_exists(QT_MAC_USE_COCOA "QtCore/qconfig.h" QT_MAC_USE_COCOA) endif() if (QT_QTCOPY_REQUIRED) - CHECK_CXX_SYMBOL_EXISTS(QT_IS_QTCOPY "QtCore/qglobal.h" QT_KDE_QT_COPY) + check_cxx_symbol_exists(QT_IS_QTCOPY "QtCore/qglobal.h" QT_KDE_QT_COPY) if (NOT QT_IS_QTCOPY) message(FATAL_ERROR "qt-copy is required, but hasn't been found") endif () @@ -1323,7 +1323,7 @@ else() # explicitly. set(FPHSA_NAME_MISMATCHED 1) endif () - FIND_PACKAGE_HANDLE_STANDARD_ARGS(Qt4 + find_package_handle_standard_args(Qt4 REQUIRED_VARS ${_QT4_FOUND_REQUIRED_VARS} VERSION_VAR QTVERSION ) diff --git a/Modules/FindQuickTime.cmake b/Modules/FindQuickTime.cmake index 89be2a6a9f..ce363e7969 100644 --- a/Modules/FindQuickTime.cmake +++ b/Modules/FindQuickTime.cmake @@ -33,4 +33,4 @@ find_library(QUICKTIME_LIBRARY QuickTime ) include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(QuickTime DEFAULT_MSG QUICKTIME_LIBRARY QUICKTIME_INCLUDE_DIR) +find_package_handle_standard_args(QuickTime DEFAULT_MSG QUICKTIME_LIBRARY QUICKTIME_INCLUDE_DIR) diff --git a/Modules/FindRTI.cmake b/Modules/FindRTI.cmake index 5a92ee5acd..f449e47db9 100644 --- a/Modules/FindRTI.cmake +++ b/Modules/FindRTI.cmake @@ -98,7 +98,7 @@ endif () set(CMAKE_FIND_LIBRARY_PREFIXES "${RTI_OLD_FIND_LIBRARY_PREFIXES}") include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(RTI DEFAULT_MSG +find_package_handle_standard_args(RTI DEFAULT_MSG RTI_LIBRARY RTI_INCLUDE_DIR) # $Id$ diff --git a/Modules/FindRuby.cmake b/Modules/FindRuby.cmake index c967839506..3293bf17db 100644 --- a/Modules/FindRuby.cmake +++ b/Modules/FindRuby.cmake @@ -397,7 +397,7 @@ if(_Ruby_DEBUG_OUTPUT) endif() include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Ruby REQUIRED_VARS ${_Ruby_REQUIRED_VARS} +find_package_handle_standard_args(Ruby REQUIRED_VARS ${_Ruby_REQUIRED_VARS} VERSION_VAR Ruby_VERSION ) if(Ruby_FOUND) diff --git a/Modules/FindSDL.cmake b/Modules/FindSDL.cmake index a4c8668180..66539950a2 100644 --- a/Modules/FindSDL.cmake +++ b/Modules/FindSDL.cmake @@ -224,7 +224,7 @@ endif() include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL +find_package_handle_standard_args(SDL REQUIRED_VARS SDL_LIBRARY SDL_INCLUDE_DIR VERSION_VAR SDL_VERSION_STRING) diff --git a/Modules/FindSDL_gfx.cmake b/Modules/FindSDL_gfx.cmake index 82c2039add..89b7618821 100644 --- a/Modules/FindSDL_gfx.cmake +++ b/Modules/FindSDL_gfx.cmake @@ -75,7 +75,7 @@ endif() include(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL_gfx +find_package_handle_standard_args(SDL_gfx REQUIRED_VARS SDL_GFX_LIBRARIES SDL_GFX_INCLUDE_DIRS VERSION_VAR SDL_GFX_VERSION_STRING) diff --git a/Modules/FindSDL_image.cmake b/Modules/FindSDL_image.cmake index 33a0695ccb..9849186b24 100644 --- a/Modules/FindSDL_image.cmake +++ b/Modules/FindSDL_image.cmake @@ -88,7 +88,7 @@ set(SDL_IMAGE_INCLUDE_DIRS ${SDL_IMAGE_INCLUDE_DIR}) include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL_image +find_package_handle_standard_args(SDL_image REQUIRED_VARS SDL_IMAGE_LIBRARIES SDL_IMAGE_INCLUDE_DIRS VERSION_VAR SDL_IMAGE_VERSION_STRING) diff --git a/Modules/FindSDL_mixer.cmake b/Modules/FindSDL_mixer.cmake index f48015e8af..92ee4e4490 100644 --- a/Modules/FindSDL_mixer.cmake +++ b/Modules/FindSDL_mixer.cmake @@ -88,7 +88,7 @@ set(SDL_MIXER_INCLUDE_DIRS ${SDL_MIXER_INCLUDE_DIR}) include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL_mixer +find_package_handle_standard_args(SDL_mixer REQUIRED_VARS SDL_MIXER_LIBRARIES SDL_MIXER_INCLUDE_DIRS VERSION_VAR SDL_MIXER_VERSION_STRING) diff --git a/Modules/FindSDL_net.cmake b/Modules/FindSDL_net.cmake index 9d0b949479..5a5881b425 100644 --- a/Modules/FindSDL_net.cmake +++ b/Modules/FindSDL_net.cmake @@ -87,7 +87,7 @@ set(SDL_NET_INCLUDE_DIRS ${SDL_NET_INCLUDE_DIR}) include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL_net +find_package_handle_standard_args(SDL_net REQUIRED_VARS SDL_NET_LIBRARIES SDL_NET_INCLUDE_DIRS VERSION_VAR SDL_NET_VERSION_STRING) diff --git a/Modules/FindSDL_sound.cmake b/Modules/FindSDL_sound.cmake index 2b8b1bfb77..33cff04678 100644 --- a/Modules/FindSDL_sound.cmake +++ b/Modules/FindSDL_sound.cmake @@ -371,7 +371,7 @@ endif() include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL_sound +find_package_handle_standard_args(SDL_sound REQUIRED_VARS SDL_SOUND_LIBRARY SDL_SOUND_INCLUDE_DIR VERSION_VAR SDL_SOUND_VERSION_STRING) diff --git a/Modules/FindSDL_ttf.cmake b/Modules/FindSDL_ttf.cmake index 8f3b02a6a1..7105185064 100644 --- a/Modules/FindSDL_ttf.cmake +++ b/Modules/FindSDL_ttf.cmake @@ -87,7 +87,7 @@ set(SDL_TTF_INCLUDE_DIRS ${SDL_TTF_INCLUDE_DIR}) include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL_ttf +find_package_handle_standard_args(SDL_ttf REQUIRED_VARS SDL_TTF_LIBRARIES SDL_TTF_INCLUDE_DIRS VERSION_VAR SDL_TTF_VERSION_STRING) diff --git a/Modules/FindSubversion.cmake b/Modules/FindSubversion.cmake index 75358545a3..ef2cdfb851 100644 --- a/Modules/FindSubversion.cmake +++ b/Modules/FindSubversion.cmake @@ -161,7 +161,7 @@ if(Subversion_SVN_EXECUTABLE) endif() include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Subversion REQUIRED_VARS Subversion_SVN_EXECUTABLE +find_package_handle_standard_args(Subversion REQUIRED_VARS Subversion_SVN_EXECUTABLE VERSION_VAR Subversion_VERSION_SVN ) # for compatibility diff --git a/Modules/FindTCL.cmake b/Modules/FindTCL.cmake index eb536674fe..8720f3b694 100644 --- a/Modules/FindTCL.cmake +++ b/Modules/FindTCL.cmake @@ -232,14 +232,14 @@ if (CMAKE_FIND_PACKAGE_NAME STREQUAL "TclStub") # the contents, detect the case in this module and suppress it explicitly. set(FPHSA_NAME_MISMATCHED 1) endif () -FIND_PACKAGE_HANDLE_STANDARD_ARGS(TCL DEFAULT_MSG TCL_LIBRARY TCL_INCLUDE_PATH) +find_package_handle_standard_args(TCL DEFAULT_MSG TCL_LIBRARY TCL_INCLUDE_PATH) set(FPHSA_NAME_MISMATCHED 1) set(TCLTK_FIND_REQUIRED ${TCL_FIND_REQUIRED}) set(TCLTK_FIND_QUIETLY ${TCL_FIND_QUIETLY}) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(TCLTK DEFAULT_MSG TCL_LIBRARY TCL_INCLUDE_PATH TK_LIBRARY TK_INCLUDE_PATH) +find_package_handle_standard_args(TCLTK DEFAULT_MSG TCL_LIBRARY TCL_INCLUDE_PATH TK_LIBRARY TK_INCLUDE_PATH) set(TK_FIND_REQUIRED ${TCL_FIND_REQUIRED}) set(TK_FIND_QUIETLY ${TCL_FIND_QUIETLY}) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(TK DEFAULT_MSG TK_LIBRARY TK_INCLUDE_PATH) +find_package_handle_standard_args(TK DEFAULT_MSG TK_LIBRARY TK_INCLUDE_PATH) unset(FPHSA_NAME_MISMATCHED) mark_as_advanced( diff --git a/Modules/FindTIFF.cmake b/Modules/FindTIFF.cmake index e541e776f3..b53a191c51 100644 --- a/Modules/FindTIFF.cmake +++ b/Modules/FindTIFF.cmake @@ -270,7 +270,7 @@ unset(TIFF_NAMES) unset(TIFF_NAMES_DEBUG) include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(TIFF +find_package_handle_standard_args(TIFF HANDLE_COMPONENTS REQUIRED_VARS TIFF_LIBRARY TIFF_INCLUDE_DIR VERSION_VAR TIFF_VERSION_STRING) diff --git a/Modules/FindTclsh.cmake b/Modules/FindTclsh.cmake index 594d0ec81f..b016324a8d 100644 --- a/Modules/FindTclsh.cmake +++ b/Modules/FindTclsh.cmake @@ -93,7 +93,7 @@ if (CMAKE_FIND_PACKAGE_NAME STREQUAL "TCL" OR # Transitively, FindTclStub includes FindTCL. set(FPHSA_NAME_MISMATCHED 1) endif () -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Tclsh +find_package_handle_standard_args(Tclsh REQUIRED_VARS TCL_TCLSH VERSION_VAR TCLSH_VERSION_STRING) unset(FPHSA_NAME_MISMATCHED) diff --git a/Modules/FindThreads.cmake b/Modules/FindThreads.cmake index 0fa6ae7661..e234734b6a 100644 --- a/Modules/FindThreads.cmake +++ b/Modules/FindThreads.cmake @@ -94,9 +94,9 @@ int main(void) macro(_threads_check_libc) if(NOT Threads_FOUND) if(CMAKE_C_COMPILER_LOADED) - CHECK_C_SOURCE_COMPILES("${PTHREAD_C_CXX_TEST_SOURCE}" CMAKE_HAVE_LIBC_PTHREAD) + check_c_source_compiles("${PTHREAD_C_CXX_TEST_SOURCE}" CMAKE_HAVE_LIBC_PTHREAD) elseif(CMAKE_CXX_COMPILER_LOADED) - CHECK_CXX_SOURCE_COMPILES("${PTHREAD_C_CXX_TEST_SOURCE}" CMAKE_HAVE_LIBC_PTHREAD) + check_cxx_source_compiles("${PTHREAD_C_CXX_TEST_SOURCE}" CMAKE_HAVE_LIBC_PTHREAD) endif() if(CMAKE_HAVE_LIBC_PTHREAD) set(CMAKE_THREAD_LIBS_INIT "") @@ -109,7 +109,7 @@ endmacro() # Do NOT even think about using it outside of this file! macro(_threads_check_lib LIBNAME FUNCNAME VARNAME) if(NOT Threads_FOUND) - CHECK_LIBRARY_EXISTS(${LIBNAME} ${FUNCNAME} "" ${VARNAME}) + check_library_exists(${LIBNAME} ${FUNCNAME} "" ${VARNAME}) if(${VARNAME}) set(CMAKE_THREAD_LIBS_INIT "-l${LIBNAME}") set(Threads_FOUND TRUE) @@ -199,7 +199,7 @@ if(CMAKE_USE_PTHREADS_INIT) # but we need to maintain compatibility here. # The CMAKE_HP_PTHREADS setting actually indicates whether CMA threads # are available. - CHECK_LIBRARY_EXISTS(cma pthread_attr_create "" CMAKE_HAVE_HP_CMA) + check_library_exists(cma pthread_attr_create "" CMAKE_HAVE_HP_CMA) if(CMAKE_HAVE_HP_CMA) set(CMAKE_THREAD_LIBS_INIT "-lcma") set(CMAKE_HP_PTHREADS_INIT 1) @@ -223,7 +223,7 @@ endif() set(CMAKE_REQUIRED_QUIET ${CMAKE_REQUIRED_QUIET_SAVE}) include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Threads DEFAULT_MSG Threads_FOUND) +find_package_handle_standard_args(Threads DEFAULT_MSG Threads_FOUND) if(THREADS_FOUND AND NOT TARGET Threads::Threads) add_library(Threads::Threads INTERFACE IMPORTED) diff --git a/Modules/FindWget.cmake b/Modules/FindWget.cmake index d0b6fdf448..ed977e26dc 100644 --- a/Modules/FindWget.cmake +++ b/Modules/FindWget.cmake @@ -25,7 +25,7 @@ find_program(WGET_EXECUTABLE ) include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Wget DEFAULT_MSG WGET_EXECUTABLE) +find_package_handle_standard_args(Wget DEFAULT_MSG WGET_EXECUTABLE) mark_as_advanced( WGET_EXECUTABLE ) diff --git a/Modules/FindXMLRPC.cmake b/Modules/FindXMLRPC.cmake index 69e6df22bf..d48e75d659 100644 --- a/Modules/FindXMLRPC.cmake +++ b/Modules/FindXMLRPC.cmake @@ -123,7 +123,7 @@ endif() # Report the results. include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS( +find_package_handle_standard_args( XMLRPC REQUIRED_VARS XMLRPC_C_FOUND XMLRPC_LIBRARIES FAIL_MESSAGE "XMLRPC was not found. Make sure the entries XMLRPC_* are set.") diff --git a/Modules/FindXalanC.cmake b/Modules/FindXalanC.cmake index 6d4801ecd9..74f0af7148 100644 --- a/Modules/FindXalanC.cmake +++ b/Modules/FindXalanC.cmake @@ -114,7 +114,7 @@ find_package(XercesC ${XalanC_XERCESC_REQUIRED}) unset(XalanC_XERCESC_REQUIRED) include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(XalanC +find_package_handle_standard_args(XalanC REQUIRED_VARS XalanC_LIBRARY XalanC_INCLUDE_DIR XalanC_VERSION diff --git a/Modules/FindXercesC.cmake b/Modules/FindXercesC.cmake index 8eaed02c81..851381bda0 100644 --- a/Modules/FindXercesC.cmake +++ b/Modules/FindXercesC.cmake @@ -112,7 +112,7 @@ unset(XercesC_VERSION_MINOR) unset(XercesC_VERSION_PATCH) include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(XercesC +find_package_handle_standard_args(XercesC REQUIRED_VARS XercesC_LIBRARY XercesC_INCLUDE_DIR XercesC_VERSION diff --git a/Modules/FindZLIB.cmake b/Modules/FindZLIB.cmake index 0842f4c009..4271e63288 100644 --- a/Modules/FindZLIB.cmake +++ b/Modules/FindZLIB.cmake @@ -199,7 +199,7 @@ if(ZLIB_INCLUDE_DIR AND EXISTS "${ZLIB_INCLUDE_DIR}/zlib.h") endif() include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZLIB REQUIRED_VARS ZLIB_LIBRARY ZLIB_INCLUDE_DIR +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 9e952c9577..bd2ba708a8 100644 --- a/Modules/Findosg.cmake +++ b/Modules/Findosg.cmake @@ -54,4 +54,4 @@ OSG_FIND_PATH (OSG osg/PositionAttitudeTransform) OSG_FIND_LIBRARY(OSG osg) include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(osg DEFAULT_MSG OSG_LIBRARY OSG_INCLUDE_DIR) +find_package_handle_standard_args(osg DEFAULT_MSG OSG_LIBRARY OSG_INCLUDE_DIR) diff --git a/Modules/FindosgAnimation.cmake b/Modules/FindosgAnimation.cmake index e31987ede3..798d608ea1 100644 --- a/Modules/FindosgAnimation.cmake +++ b/Modules/FindosgAnimation.cmake @@ -48,5 +48,5 @@ OSG_FIND_PATH (OSGANIMATION osgAnimation/Animation) OSG_FIND_LIBRARY(OSGANIMATION osgAnimation) include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(osgAnimation DEFAULT_MSG +find_package_handle_standard_args(osgAnimation DEFAULT_MSG OSGANIMATION_LIBRARY OSGANIMATION_INCLUDE_DIR) diff --git a/Modules/FindosgDB.cmake b/Modules/FindosgDB.cmake index 9366d21c9c..c162cdfed6 100644 --- a/Modules/FindosgDB.cmake +++ b/Modules/FindosgDB.cmake @@ -52,5 +52,5 @@ OSG_FIND_PATH (OSGDB osgDB/DatabasePager) OSG_FIND_LIBRARY(OSGDB osgDB) include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(osgDB DEFAULT_MSG +find_package_handle_standard_args(osgDB DEFAULT_MSG OSGDB_LIBRARY OSGDB_INCLUDE_DIR) diff --git a/Modules/FindosgFX.cmake b/Modules/FindosgFX.cmake index 79362ef5ad..02b1b03be4 100644 --- a/Modules/FindosgFX.cmake +++ b/Modules/FindosgFX.cmake @@ -49,5 +49,5 @@ OSG_FIND_PATH (OSGFX osgFX/BumpMapping) OSG_FIND_LIBRARY(OSGFX osgFX) include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(osgFX DEFAULT_MSG +find_package_handle_standard_args(osgFX DEFAULT_MSG OSGFX_LIBRARY OSGFX_INCLUDE_DIR) diff --git a/Modules/FindosgGA.cmake b/Modules/FindosgGA.cmake index 7ebcce83bc..b2cd793b5e 100644 --- a/Modules/FindosgGA.cmake +++ b/Modules/FindosgGA.cmake @@ -49,5 +49,5 @@ OSG_FIND_PATH (OSGGA osgGA/FlightManipulator) OSG_FIND_LIBRARY(OSGGA osgGA) include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(osgGA DEFAULT_MSG +find_package_handle_standard_args(osgGA DEFAULT_MSG OSGGA_LIBRARY OSGGA_INCLUDE_DIR) diff --git a/Modules/FindosgIntrospection.cmake b/Modules/FindosgIntrospection.cmake index c0c28f261b..ed6fc80cbd 100644 --- a/Modules/FindosgIntrospection.cmake +++ b/Modules/FindosgIntrospection.cmake @@ -49,5 +49,5 @@ OSG_FIND_PATH (OSGINTROSPECTION osgIntrospection/Reflection) OSG_FIND_LIBRARY(OSGINTROSPECTION osgIntrospection) include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(osgIntrospection DEFAULT_MSG +find_package_handle_standard_args(osgIntrospection DEFAULT_MSG OSGINTROSPECTION_LIBRARY OSGINTROSPECTION_INCLUDE_DIR) diff --git a/Modules/FindosgManipulator.cmake b/Modules/FindosgManipulator.cmake index 47c74f6cb9..cfc1c1fed9 100644 --- a/Modules/FindosgManipulator.cmake +++ b/Modules/FindosgManipulator.cmake @@ -49,5 +49,5 @@ OSG_FIND_PATH (OSGMANIPULATOR osgManipulator/TrackballDragger) OSG_FIND_LIBRARY(OSGMANIPULATOR osgManipulator) include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(osgManipulator DEFAULT_MSG +find_package_handle_standard_args(osgManipulator DEFAULT_MSG OSGMANIPULATOR_LIBRARY OSGMANIPULATOR_INCLUDE_DIR) diff --git a/Modules/FindosgParticle.cmake b/Modules/FindosgParticle.cmake index cbe033d3c8..d33b5dd845 100644 --- a/Modules/FindosgParticle.cmake +++ b/Modules/FindosgParticle.cmake @@ -49,5 +49,5 @@ OSG_FIND_PATH (OSGPARTICLE osgParticle/FireEffect) OSG_FIND_LIBRARY(OSGPARTICLE osgParticle) include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(osgParticle DEFAULT_MSG +find_package_handle_standard_args(osgParticle DEFAULT_MSG OSGPARTICLE_LIBRARY OSGPARTICLE_INCLUDE_DIR) diff --git a/Modules/FindosgPresentation.cmake b/Modules/FindosgPresentation.cmake index e8c8b4fc71..edfce3b27e 100644 --- a/Modules/FindosgPresentation.cmake +++ b/Modules/FindosgPresentation.cmake @@ -49,5 +49,5 @@ OSG_FIND_PATH (OSGPRESENTATION osgPresentation/SlideEventHandler) OSG_FIND_LIBRARY(OSGPRESENTATION osgPresentation) include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(osgPresentation DEFAULT_MSG +find_package_handle_standard_args(osgPresentation DEFAULT_MSG OSGPRESENTATION_LIBRARY OSGPRESENTATION_INCLUDE_DIR) diff --git a/Modules/FindosgProducer.cmake b/Modules/FindosgProducer.cmake index 92f0d20f34..f351cb3c65 100644 --- a/Modules/FindosgProducer.cmake +++ b/Modules/FindosgProducer.cmake @@ -49,5 +49,5 @@ OSG_FIND_PATH (OSGPRODUCER osgProducer/OsgSceneHandler) OSG_FIND_LIBRARY(OSGPRODUCER osgProducer) include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(osgProducer DEFAULT_MSG +find_package_handle_standard_args(osgProducer DEFAULT_MSG OSGPRODUCER_LIBRARY OSGPRODUCER_INCLUDE_DIR) diff --git a/Modules/FindosgQt.cmake b/Modules/FindosgQt.cmake index 2ad717411e..98e00e127f 100644 --- a/Modules/FindosgQt.cmake +++ b/Modules/FindosgQt.cmake @@ -50,5 +50,5 @@ OSG_FIND_PATH (OSGQT osgQt/GraphicsWindowQt) OSG_FIND_LIBRARY(OSGQT osgQt) include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(osgQt DEFAULT_MSG +find_package_handle_standard_args(osgQt DEFAULT_MSG OSGQT_LIBRARY OSGQT_INCLUDE_DIR) diff --git a/Modules/FindosgShadow.cmake b/Modules/FindosgShadow.cmake index 12eb9da52b..9157b6cec0 100644 --- a/Modules/FindosgShadow.cmake +++ b/Modules/FindosgShadow.cmake @@ -49,5 +49,5 @@ OSG_FIND_PATH (OSGSHADOW osgShadow/ShadowTexture) OSG_FIND_LIBRARY(OSGSHADOW osgShadow) include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(osgShadow DEFAULT_MSG +find_package_handle_standard_args(osgShadow DEFAULT_MSG OSGSHADOW_LIBRARY OSGSHADOW_INCLUDE_DIR) diff --git a/Modules/FindosgSim.cmake b/Modules/FindosgSim.cmake index 37ef03c131..ef242f716f 100644 --- a/Modules/FindosgSim.cmake +++ b/Modules/FindosgSim.cmake @@ -49,5 +49,5 @@ OSG_FIND_PATH (OSGSIM osgSim/ImpostorSprite) OSG_FIND_LIBRARY(OSGSIM osgSim) include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(osgSim DEFAULT_MSG +find_package_handle_standard_args(osgSim DEFAULT_MSG OSGSIM_LIBRARY OSGSIM_INCLUDE_DIR) diff --git a/Modules/FindosgTerrain.cmake b/Modules/FindosgTerrain.cmake index a2de4eafaf..0b1b3cf4da 100644 --- a/Modules/FindosgTerrain.cmake +++ b/Modules/FindosgTerrain.cmake @@ -49,5 +49,5 @@ OSG_FIND_PATH (OSGTERRAIN osgTerrain/Terrain) OSG_FIND_LIBRARY(OSGTERRAIN osgTerrain) include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(osgTerrain DEFAULT_MSG +find_package_handle_standard_args(osgTerrain DEFAULT_MSG OSGTERRAIN_LIBRARY OSGTERRAIN_INCLUDE_DIR) diff --git a/Modules/FindosgText.cmake b/Modules/FindosgText.cmake index 7646ad0d01..aee362d33d 100644 --- a/Modules/FindosgText.cmake +++ b/Modules/FindosgText.cmake @@ -49,5 +49,5 @@ OSG_FIND_PATH (OSGTEXT osgText/Text) OSG_FIND_LIBRARY(OSGTEXT osgText) include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(osgText DEFAULT_MSG +find_package_handle_standard_args(osgText DEFAULT_MSG OSGTEXT_LIBRARY OSGTEXT_INCLUDE_DIR) diff --git a/Modules/FindosgUtil.cmake b/Modules/FindosgUtil.cmake index a34fea0d8c..e82cc2bafb 100644 --- a/Modules/FindosgUtil.cmake +++ b/Modules/FindosgUtil.cmake @@ -49,5 +49,5 @@ OSG_FIND_PATH (OSGUTIL osgUtil/SceneView) OSG_FIND_LIBRARY(OSGUTIL osgUtil) include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(osgUtil DEFAULT_MSG +find_package_handle_standard_args(osgUtil DEFAULT_MSG OSGUTIL_LIBRARY OSGUTIL_INCLUDE_DIR) diff --git a/Modules/FindosgViewer.cmake b/Modules/FindosgViewer.cmake index c3834e8c28..8de19c6628 100644 --- a/Modules/FindosgViewer.cmake +++ b/Modules/FindosgViewer.cmake @@ -49,5 +49,5 @@ OSG_FIND_PATH (OSGVIEWER osgViewer/Viewer) OSG_FIND_LIBRARY(OSGVIEWER osgViewer) include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(osgViewer DEFAULT_MSG +find_package_handle_standard_args(osgViewer DEFAULT_MSG OSGVIEWER_LIBRARY OSGVIEWER_INCLUDE_DIR) diff --git a/Modules/FindosgVolume.cmake b/Modules/FindosgVolume.cmake index 58d9f7afa2..d58aaeed03 100644 --- a/Modules/FindosgVolume.cmake +++ b/Modules/FindosgVolume.cmake @@ -49,5 +49,5 @@ OSG_FIND_PATH (OSGVOLUME osgVolume/Volume) OSG_FIND_LIBRARY(OSGVOLUME osgVolume) include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(osgVolume DEFAULT_MSG +find_package_handle_standard_args(osgVolume DEFAULT_MSG OSGVOLUME_LIBRARY OSGVOLUME_INCLUDE_DIR) diff --git a/Modules/FindosgWidget.cmake b/Modules/FindosgWidget.cmake index 4049fada2f..39998f8852 100644 --- a/Modules/FindosgWidget.cmake +++ b/Modules/FindosgWidget.cmake @@ -50,5 +50,5 @@ OSG_FIND_PATH (OSGWIDGET osgWidget/Widget) OSG_FIND_LIBRARY(OSGWIDGET osgWidget) include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(osgWidget DEFAULT_MSG +find_package_handle_standard_args(osgWidget DEFAULT_MSG OSGWIDGET_LIBRARY OSGWIDGET_INCLUDE_DIR) diff --git a/Modules/GoogleTest.cmake b/Modules/GoogleTest.cmake index 17800b192a..82725bdecc 100644 --- a/Modules/GoogleTest.cmake +++ b/Modules/GoogleTest.cmake @@ -433,7 +433,7 @@ function(gtest_add_tests) set(accumulated "") # Iterate over each line in the file so that we know the line number of a test definition foreach(line_str IN LISTS content_lines) - MATH(EXPR line "${line}+1") + math(EXPR line "${line}+1") # Check if the current line is the start of a test definition string(REGEX MATCH "[ \t]*${gtest_test_type_regex}[ \t]*[\\(]*" accumulate_start_hit "${line_str}") if(accumulate_start_hit) diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake index d50e33091c..97e972a31f 100644 --- a/Modules/Platform/Darwin.cmake +++ b/Modules/Platform/Darwin.cmake @@ -36,7 +36,7 @@ if(NOT DEFINED HAVE_FLAG_SEARCH_PATHS_FIRST) endif() # More desirable, but does not work: #include(CheckCXXCompilerFlag) - #CHECK_CXX_COMPILER_FLAG("-Wl,-search_paths_first" HAVE_FLAG_SEARCH_PATHS_FIRST) + #check_cxx_compiler_flag("-Wl,-search_paths_first" HAVE_FLAG_SEARCH_PATHS_FIRST) set(CMAKE_SHARED_LIBRARY_PREFIX "lib") set(CMAKE_SHARED_LIBRARY_SUFFIX ".dylib") diff --git a/Modules/Platform/GHS-MULTI-Determine.cmake b/Modules/Platform/GHS-MULTI-Determine.cmake index 67464f7733..3d893dda47 100644 --- a/Modules/Platform/GHS-MULTI-Determine.cmake +++ b/Modules/Platform/GHS-MULTI-Determine.cmake @@ -72,9 +72,9 @@ if(_ghs_os_dir AND NOT DEFINED GHS_OS_DIR) if(EXISTS ${GHS_OS_ROOT}) # Get all directories in root directory - FILE(GLOB GHS_CANDIDATE_OS_DIRS + file(GLOB GHS_CANDIDATE_OS_DIRS LIST_DIRECTORIES true RELATIVE ${GHS_OS_ROOT} ${GHS_OS_ROOT}/*) - FILE(GLOB GHS_CANDIDATE_OS_FILES + file(GLOB GHS_CANDIDATE_OS_FILES LIST_DIRECTORIES false RELATIVE ${GHS_OS_ROOT} ${GHS_OS_ROOT}/*) if(GHS_CANDIDATE_OS_FILES) list(REMOVE_ITEM GHS_CANDIDATE_OS_DIRS ${GHS_CANDIDATE_OS_FILES}) diff --git a/Modules/Platform/Haiku.cmake b/Modules/Platform/Haiku.cmake index 810d26e0ff..3610389a78 100644 --- a/Modules/Platform/Haiku.cmake +++ b/Modules/Platform/Haiku.cmake @@ -58,7 +58,7 @@ list(APPEND CMAKE_SYSTEM_PREFIX_PATH /boot/system ) -LIST(APPEND CMAKE_HAIKU_COMMON_INCLUDE_DIRECTORIES +list(APPEND CMAKE_HAIKU_COMMON_INCLUDE_DIRECTORIES /boot/system/non-packaged/develop/headers${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR} /boot/system/develop/headers/os /boot/system/develop/headers/os/app @@ -92,30 +92,30 @@ LIST(APPEND CMAKE_HAIKU_COMMON_INCLUDE_DIRECTORIES /boot/system/develop/headers${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR} ) if(CMAKE_HAIKU_SECONDARY_ARCH) - LIST(APPEND CMAKE_HAIKU_COMMON_INCLUDE_DIRECTORIES + list(APPEND CMAKE_HAIKU_COMMON_INCLUDE_DIRECTORIES /boot/system/develop/headers ) endif() -LIST(APPEND CMAKE_HAIKU_C_INCLUDE_DIRECTORIES +list(APPEND CMAKE_HAIKU_C_INCLUDE_DIRECTORIES ${CMAKE_HAIKU_COMMON_INCLUDE_DIRECTORIES} ) -LIST(APPEND CMAKE_HAIKU_CXX_INCLUDE_DIRECTORIES +list(APPEND CMAKE_HAIKU_CXX_INCLUDE_DIRECTORIES ${CMAKE_HAIKU_COMMON_INCLUDE_DIRECTORIES}) -LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH ${CMAKE_HAIKU_C_INCLUDE_DIRECTORIES}) +list(APPEND CMAKE_SYSTEM_INCLUDE_PATH ${CMAKE_HAIKU_C_INCLUDE_DIRECTORIES}) -LIST(APPEND CMAKE_HAIKU_DEVELOP_LIB_DIRECTORIES +list(APPEND CMAKE_HAIKU_DEVELOP_LIB_DIRECTORIES /boot/system/non-packaged/develop/lib${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR} /boot/system/develop/lib${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR} ) -LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES +list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES ${CMAKE_HAIKU_DEVELOP_LIB_DIRECTORIES} ) -LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_HAIKU_DEVELOP_LIB_DIRECTORIES}) +list(APPEND CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_HAIKU_DEVELOP_LIB_DIRECTORIES}) if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) set(CMAKE_INSTALL_PREFIX "/boot/system" CACHE PATH diff --git a/Modules/Qt4ConfigDependentSettings.cmake b/Modules/Qt4ConfigDependentSettings.cmake index 5ef0351dfe..bef905a644 100644 --- a/Modules/Qt4ConfigDependentSettings.cmake +++ b/Modules/Qt4ConfigDependentSettings.cmake @@ -240,7 +240,7 @@ endif() if(QT_QCONFIG MATCHES "clock-monotonic") set(CMAKE_REQUIRED_LIBRARIES_SAVE ${CMAKE_REQUIRED_LIBRARIES}) set(CMAKE_REQUIRED_LIBRARIES rt) - CHECK_SYMBOL_EXISTS(_POSIX_TIMERS "unistd.h;time.h" QT_POSIX_TIMERS) + check_symbol_exists(_POSIX_TIMERS "unistd.h;time.h" QT_POSIX_TIMERS) set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES_SAVE}) if(QT_POSIX_TIMERS) find_library(QT_RT_LIBRARY NAMES rt) diff --git a/Modules/TestBigEndian.cmake b/Modules/TestBigEndian.cmake index 316969e710..8962156876 100644 --- a/Modules/TestBigEndian.cmake +++ b/Modules/TestBigEndian.cmake @@ -52,19 +52,19 @@ macro(__TEST_BIG_ENDIAN_LEGACY_IMPL VARIABLE) message(FATAL_ERROR "TEST_BIG_ENDIAN needs either C or CXX language enabled") endif() - CHECK_TYPE_SIZE("unsigned short" CMAKE_SIZEOF_UNSIGNED_SHORT LANGUAGE ${_test_language}) + check_type_size("unsigned short" CMAKE_SIZEOF_UNSIGNED_SHORT LANGUAGE ${_test_language}) if(CMAKE_SIZEOF_UNSIGNED_SHORT EQUAL 2) message(CHECK_PASS "Using unsigned short") set(CMAKE_16BIT_TYPE "unsigned short") else() - CHECK_TYPE_SIZE("unsigned int" CMAKE_SIZEOF_UNSIGNED_INT LANGUAGE ${_test_language}) + check_type_size("unsigned int" CMAKE_SIZEOF_UNSIGNED_INT LANGUAGE ${_test_language}) if(CMAKE_SIZEOF_UNSIGNED_INT) message(CHECK_PASS "Using unsigned int") set(CMAKE_16BIT_TYPE "unsigned int") else() - CHECK_TYPE_SIZE("unsigned long" CMAKE_SIZEOF_UNSIGNED_LONG LANGUAGE ${_test_language}) + check_type_size("unsigned long" CMAKE_SIZEOF_UNSIGNED_LONG LANGUAGE ${_test_language}) if(CMAKE_SIZEOF_UNSIGNED_LONG) message(CHECK_PASS "Using unsigned long") set(CMAKE_16BIT_TYPE "unsigned long") diff --git a/Modules/TestForANSIStreamHeaders.cmake b/Modules/TestForANSIStreamHeaders.cmake index d4cfa2d829..e3b93b03af 100644 --- a/Modules/TestForANSIStreamHeaders.cmake +++ b/Modules/TestForANSIStreamHeaders.cmake @@ -18,7 +18,7 @@ check if the compiler supports the standard ANSI iostream header include(${CMAKE_CURRENT_LIST_DIR}/CheckIncludeFileCXX.cmake) if(NOT CMAKE_NO_ANSI_STREAM_HEADERS) - CHECK_INCLUDE_FILE_CXX(iostream CMAKE_ANSI_STREAM_HEADERS) + check_include_file_cxx(iostream CMAKE_ANSI_STREAM_HEADERS) if (CMAKE_ANSI_STREAM_HEADERS) set (CMAKE_NO_ANSI_STREAM_HEADERS 0 CACHE INTERNAL "Does the compiler support headers like iostream.") diff --git a/Source/Modules/FindJsonCpp.cmake b/Source/Modules/FindJsonCpp.cmake index 74fa181768..b142bfb83a 100644 --- a/Source/Modules/FindJsonCpp.cmake +++ b/Source/Modules/FindJsonCpp.cmake @@ -84,7 +84,7 @@ unset(_JsonCpp_H) #----------------------------------------------------------------------------- include(${CMAKE_CURRENT_LIST_DIR}/../../Modules/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(JsonCpp +find_package_handle_standard_args(JsonCpp REQUIRED_VARS JsonCpp_LIBRARY JsonCpp_INCLUDE_DIR VERSION_VAR JsonCpp_VERSION_STRING ) diff --git a/Source/Modules/FindLibRHash.cmake b/Source/Modules/FindLibRHash.cmake index c23a028e06..9adc9afbde 100644 --- a/Source/Modules/FindLibRHash.cmake +++ b/Source/Modules/FindLibRHash.cmake @@ -52,7 +52,7 @@ mark_as_advanced(LibRHash_INCLUDE_DIR) #----------------------------------------------------------------------------- include(${CMAKE_CURRENT_LIST_DIR}/../../Modules/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibRHash +find_package_handle_standard_args(LibRHash REQUIRED_VARS LibRHash_LIBRARY LibRHash_INCLUDE_DIR ) diff --git a/Source/Modules/FindLibUUID.cmake b/Source/Modules/FindLibUUID.cmake index 28bbec2fb9..aba1c276bf 100644 --- a/Source/Modules/FindLibUUID.cmake +++ b/Source/Modules/FindLibUUID.cmake @@ -71,7 +71,7 @@ mark_as_advanced(LibUUID_INCLUDE_DIR) #----------------------------------------------------------------------------- include(${CMAKE_CURRENT_LIST_DIR}/../../Modules/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibUUID +find_package_handle_standard_args(LibUUID REQUIRED_VARS LibUUID_LIBRARY LibUUID_INCLUDE_DIR ) diff --git a/Source/Modules/FindLibUV.cmake b/Source/Modules/FindLibUV.cmake index 9baeb824bb..b374dcc9e0 100644 --- a/Source/Modules/FindLibUV.cmake +++ b/Source/Modules/FindLibUV.cmake @@ -101,7 +101,7 @@ unset(_LibUV_H) #----------------------------------------------------------------------------- include(${CMAKE_CURRENT_LIST_DIR}/../../Modules/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibUV +find_package_handle_standard_args(LibUV REQUIRED_VARS LibUV_LIBRARY LibUV_INCLUDE_DIR VERSION_VAR LibUV_VERSION ) diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index d69f433e53..f422458556 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -572,7 +572,7 @@ if(BUILD_TESTING) set(CMAKE_REQUIRED_INCLUDES ${QT_INCLUDES}) set(CMAKE_REQUIRED_LIBRARIES ${QT_QTCORE_LIBRARIES}) - CHECK_CXX_SOURCE_COMPILES("#include \n int main() {return (qApp == 0 ? 0 : 1); }\n" + check_cxx_source_compiles("#include \n int main() {return (qApp == 0 ? 0 : 1); }\n" QT4_WORKS) set(CMAKE_REQUIRED_INCLUDES "${_save_CMAKE_REQUIRED_INCLUDES}")