From 745b56f58c8147aa6015a918f3bfd19abc807b48 Mon Sep 17 00:00:00 2001 From: Rolf Eike Beer Date: Tue, 22 Nov 2016 22:18:04 +0100 Subject: Find*.cmake: drop the comments before including FPHSA No need to explain this over and over again. While at it, do some other minor cleanups to whitespace and comments (i.e. delete them). --- Modules/FindALSA.cmake | 2 -- Modules/FindASPELL.cmake | 2 -- Modules/FindAVIFile.cmake | 2 -- Modules/FindArmadillo.cmake | 7 ------- Modules/FindBISON.cmake | 2 -- Modules/FindBZip2.cmake | 2 -- Modules/FindBullet.cmake | 2 -- Modules/FindCURL.cmake | 2 -- Modules/FindCoin3D.cmake | 4 ---- Modules/FindCurses.cmake | 2 -- Modules/FindDart.cmake | 2 -- Modules/FindEXPAT.cmake | 2 -- Modules/FindFLEX.cmake | 2 -- Modules/FindFreetype.cmake | 3 --- Modules/FindGIF.cmake | 2 -- Modules/FindGSL.cmake | 1 - Modules/FindGTK2.cmake | 1 - Modules/FindGit.cmake | 3 --- Modules/FindGnuTLS.cmake | 3 --- Modules/FindGnuplot.cmake | 3 --- Modules/FindHSPELL.cmake | 3 --- Modules/FindHg.cmake | 2 -- Modules/FindIcotool.cmake | 2 -- Modules/FindJPEG.cmake | 2 -- Modules/FindJasper.cmake | 2 -- Modules/FindJava.cmake | 1 - Modules/FindLATEX.cmake | 1 - Modules/FindLTTngUST.cmake | 2 -- Modules/FindLibArchive.cmake | 2 -- Modules/FindLibXml2.cmake | 2 -- Modules/FindMPEG.cmake | 2 -- Modules/FindMPEG2.cmake | 3 --- Modules/FindMPI.cmake | 1 - Modules/FindMotif.cmake | 3 --- Modules/FindOpenAL.cmake | 2 -- Modules/FindOpenGL.cmake | 2 -- Modules/FindOpenSceneGraph.cmake | 1 - Modules/FindPNG.cmake | 2 -- Modules/FindPerl.cmake | 2 -- Modules/FindPerlLibs.cmake | 2 -- Modules/FindPhysFS.cmake | 3 --- Modules/FindPythonInterp.cmake | 2 -- Modules/FindQuickTime.cmake | 2 -- Modules/FindTCL.cmake | 2 -- Modules/FindTIFF.cmake | 2 -- Modules/FindTclsh.cmake | 2 -- Modules/FindWget.cmake | 4 +--- Modules/FindZLIB.cmake | 2 -- 48 files changed, 1 insertion(+), 106 deletions(-) diff --git a/Modules/FindALSA.cmake b/Modules/FindALSA.cmake index d0ffa03..fa9a434 100644 --- a/Modules/FindALSA.cmake +++ b/Modules/FindALSA.cmake @@ -39,8 +39,6 @@ if(ALSA_INCLUDE_DIR AND EXISTS "${ALSA_INCLUDE_DIR}/alsa/version.h") unset(alsa_version_str) endif() -# handle the QUIETLY and REQUIRED arguments and set ALSA_FOUND to TRUE if -# all listed variables are TRUE include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) FIND_PACKAGE_HANDLE_STANDARD_ARGS(ALSA REQUIRED_VARS ALSA_LIBRARY ALSA_INCLUDE_DIR diff --git a/Modules/FindASPELL.cmake b/Modules/FindASPELL.cmake index 8f2b007..6944ac1 100644 --- a/Modules/FindASPELL.cmake +++ b/Modules/FindASPELL.cmake @@ -25,8 +25,6 @@ find_program(ASPELL_EXECUTABLE find_library(ASPELL_LIBRARIES NAMES aspell aspell-15 libaspell-15 libaspell) -# handle the QUIETLY and REQUIRED arguments and set ASPELL_FOUND to TRUE if -# all listed variables are TRUE include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) FIND_PACKAGE_HANDLE_STANDARD_ARGS(ASPELL DEFAULT_MSG ASPELL_LIBRARIES ASPELL_INCLUDE_DIR ASPELL_EXECUTABLE) diff --git a/Modules/FindAVIFile.cmake b/Modules/FindAVIFile.cmake index 38701be..88a2a25 100644 --- a/Modules/FindAVIFile.cmake +++ b/Modules/FindAVIFile.cmake @@ -32,8 +32,6 @@ if (UNIX) endif () -# handle the QUIETLY and REQUIRED arguments and set AVIFILE_FOUND to TRUE if -# all listed variables are TRUE include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) FIND_PACKAGE_HANDLE_STANDARD_ARGS(AVIFile DEFAULT_MSG AVIFILE_INCLUDE_DIR AVIFILE_AVIPLAY_LIBRARY) diff --git a/Modules/FindArmadillo.cmake b/Modules/FindArmadillo.cmake index fab04c2..95f0c56 100644 --- a/Modules/FindArmadillo.cmake +++ b/Modules/FindArmadillo.cmake @@ -73,10 +73,6 @@ if(ARMADILLO_INCLUDE_DIR) set(ARMADILLO_VERSION_STRING "${ARMADILLO_VERSION_MAJOR}.${ARMADILLO_VERSION_MINOR}.${ARMADILLO_VERSION_PATCH}") endif () -#====================== - - -# Checks 'REQUIRED', 'QUIET' and versions. include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) find_package_handle_standard_args(Armadillo REQUIRED_VARS ARMADILLO_LIBRARY ARMADILLO_INCLUDE_DIR @@ -88,10 +84,7 @@ if (ARMADILLO_FOUND) set(ARMADILLO_LIBRARIES ${ARMADILLO_LIBRARY}) endif () - # Hide internal variables mark_as_advanced( ARMADILLO_INCLUDE_DIR ARMADILLO_LIBRARY) - -#====================== diff --git a/Modules/FindBISON.cmake b/Modules/FindBISON.cmake index d40b806..0ebd465 100644 --- a/Modules/FindBISON.cmake +++ b/Modules/FindBISON.cmake @@ -253,5 +253,3 @@ endif() include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) FIND_PACKAGE_HANDLE_STANDARD_ARGS(BISON REQUIRED_VARS BISON_EXECUTABLE VERSION_VAR BISON_VERSION) - -# FindBISON.cmake ends here diff --git a/Modules/FindBZip2.cmake b/Modules/FindBZip2.cmake index 2d93eba..d2307f1 100644 --- a/Modules/FindBZip2.cmake +++ b/Modules/FindBZip2.cmake @@ -45,8 +45,6 @@ if (BZIP2_INCLUDE_DIR AND EXISTS "${BZIP2_INCLUDE_DIR}/bzlib.h") string(REGEX REPLACE ".* bzip2/libbzip2 version ([0-9]+\\.[^ ]+) of [0-9]+ .*" "\\1" BZIP2_VERSION_STRING "${BZLIB_H}") endif () -# handle the QUIETLY and REQUIRED arguments and set BZip2_FOUND to TRUE if -# all listed variables are TRUE include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) FIND_PACKAGE_HANDLE_STANDARD_ARGS(BZip2 REQUIRED_VARS BZIP2_LIBRARIES BZIP2_INCLUDE_DIR diff --git a/Modules/FindBullet.cmake b/Modules/FindBullet.cmake index d000f79..fc6695c 100644 --- a/Modules/FindBullet.cmake +++ b/Modules/FindBullet.cmake @@ -78,8 +78,6 @@ _FIND_BULLET_LIBRARY(BULLET_SOFTBODY_LIBRARY BulletSoftBody) _FIND_BULLET_LIBRARY(BULLET_SOFTBODY_LIBRARY_DEBUG BulletSoftBody_Debug BulletSoftBody_d) -# handle the QUIETLY and REQUIRED arguments and set BULLET_FOUND to TRUE if -# all listed variables are TRUE include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) FIND_PACKAGE_HANDLE_STANDARD_ARGS(Bullet DEFAULT_MSG BULLET_DYNAMICS_LIBRARY BULLET_COLLISION_LIBRARY BULLET_MATH_LIBRARY diff --git a/Modules/FindCURL.cmake b/Modules/FindCURL.cmake index 200f8c3..f4bcc36 100644 --- a/Modules/FindCURL.cmake +++ b/Modules/FindCURL.cmake @@ -44,8 +44,6 @@ if(CURL_INCLUDE_DIR) endforeach() endif() -# handle the QUIETLY and REQUIRED arguments and set CURL_FOUND to TRUE if -# all listed variables are TRUE include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) FIND_PACKAGE_HANDLE_STANDARD_ARGS(CURL REQUIRED_VARS CURL_LIBRARY CURL_INCLUDE_DIR diff --git a/Modules/FindCoin3D.cmake b/Modules/FindCoin3D.cmake index fea644d..f11903d 100644 --- a/Modules/FindCoin3D.cmake +++ b/Modules/FindCoin3D.cmake @@ -70,11 +70,7 @@ else () endif () -# handle the QUIETLY and REQUIRED arguments and set COIN3D_FOUND to TRUE if -# all listed variables are TRUE include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) 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/FindCurses.cmake b/Modules/FindCurses.cmake index a0929ce..4365e99 100644 --- a/Modules/FindCurses.cmake +++ b/Modules/FindCurses.cmake @@ -190,8 +190,6 @@ endif() set(CURSES_INCLUDE_DIRS ${CURSES_INCLUDE_PATH}) set(CURSES_INCLUDE_DIR ${CURSES_INCLUDE_PATH}) # compatibility -# handle the QUIETLY and REQUIRED arguments and set CURSES_FOUND to TRUE if -# all listed variables are TRUE include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) FIND_PACKAGE_HANDLE_STANDARD_ARGS(Curses DEFAULT_MSG CURSES_LIBRARY CURSES_INCLUDE_PATH) diff --git a/Modules/FindDart.cmake b/Modules/FindDart.cmake index 37164e6..acd4ef6 100644 --- a/Modules/FindDart.cmake +++ b/Modules/FindDart.cmake @@ -26,8 +26,6 @@ find_path(DART_ROOT README.INSTALL DOC "If you have Dart installed, where is it located?" ) -# handle the QUIETLY and REQUIRED arguments and set DART_FOUND to TRUE if -# all listed variables are TRUE include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) FIND_PACKAGE_HANDLE_STANDARD_ARGS(Dart DEFAULT_MSG DART_ROOT) diff --git a/Modules/FindEXPAT.cmake b/Modules/FindEXPAT.cmake index cc89203..09963fc 100644 --- a/Modules/FindEXPAT.cmake +++ b/Modules/FindEXPAT.cmake @@ -44,8 +44,6 @@ if (EXPAT_INCLUDE_DIR AND EXISTS "${EXPAT_INCLUDE_DIR}/expat.h") endforeach() endif () -# handle the QUIETLY and REQUIRED arguments and set EXPAT_FOUND to TRUE if -# all listed variables are TRUE include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) FIND_PACKAGE_HANDLE_STANDARD_ARGS(EXPAT REQUIRED_VARS EXPAT_LIBRARY EXPAT_INCLUDE_DIR diff --git a/Modules/FindFLEX.cmake b/Modules/FindFLEX.cmake index 69cf513..214873c 100644 --- a/Modules/FindFLEX.cmake +++ b/Modules/FindFLEX.cmake @@ -218,5 +218,3 @@ endif() include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) FIND_PACKAGE_HANDLE_STANDARD_ARGS(FLEX REQUIRED_VARS FLEX_EXECUTABLE VERSION_VAR FLEX_VERSION) - -# FindFLEX.cmake ends here diff --git a/Modules/FindFreetype.cmake b/Modules/FindFreetype.cmake index 21a5d89..9ea77df 100644 --- a/Modules/FindFreetype.cmake +++ b/Modules/FindFreetype.cmake @@ -135,9 +135,6 @@ if(FREETYPE_INCLUDE_DIR_freetype2 AND FREETYPE_H) endforeach() endif() - -# handle the QUIETLY and REQUIRED arguments and set FREETYPE_FOUND to TRUE if -# all listed variables are TRUE include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) find_package_handle_standard_args( diff --git a/Modules/FindGIF.cmake b/Modules/FindGIF.cmake index 88c4180..0843d5f 100644 --- a/Modules/FindGIF.cmake +++ b/Modules/FindGIF.cmake @@ -91,8 +91,6 @@ if(GIF_INCLUDE_DIR) CMAKE_POP_CHECK_STATE() endif() -# handle the QUIETLY and REQUIRED arguments and set GIF_FOUND to TRUE if -# all listed variables are TRUE include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) FIND_PACKAGE_HANDLE_STANDARD_ARGS(GIF REQUIRED_VARS GIF_LIBRARY GIF_INCLUDE_DIR VERSION_VAR GIF_VERSION ) diff --git a/Modules/FindGSL.cmake b/Modules/FindGSL.cmake index 98377a2..446c3a8 100644 --- a/Modules/FindGSL.cmake +++ b/Modules/FindGSL.cmake @@ -55,7 +55,6 @@ # GSL_LIBRARY_DEBUG - Location of the debug GSL library (if any). # -# Include these modules to handle the QUIETLY and REQUIRED arguments. include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) #============================================================================= diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake index 78dc6ba..1f447f1 100644 --- a/Modules/FindGTK2.cmake +++ b/Modules/FindGTK2.cmake @@ -957,4 +957,3 @@ endif() if(GTK2_INCLUDE_DIRS) list(REMOVE_DUPLICATES GTK2_INCLUDE_DIRS) endif() - diff --git a/Modules/FindGit.cmake b/Modules/FindGit.cmake index 5d38193..769c6c3 100644 --- a/Modules/FindGit.cmake +++ b/Modules/FindGit.cmake @@ -65,9 +65,6 @@ if(GIT_EXECUTABLE) unset(git_version) endif() -# Handle the QUIETLY and REQUIRED arguments and set Git_FOUND to TRUE if -# all listed variables are TRUE - include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) find_package_handle_standard_args(Git REQUIRED_VARS GIT_EXECUTABLE diff --git a/Modules/FindGnuTLS.cmake b/Modules/FindGnuTLS.cmake index a6ab092..1a97d99 100644 --- a/Modules/FindGnuTLS.cmake +++ b/Modules/FindGnuTLS.cmake @@ -50,8 +50,6 @@ find_library(GNUTLS_LIBRARY NAMES gnutls libgnutls mark_as_advanced(GNUTLS_INCLUDE_DIR GNUTLS_LIBRARY) -# handle the QUIETLY and REQUIRED arguments and set GNUTLS_FOUND to TRUE if -# all listed variables are TRUE include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) FIND_PACKAGE_HANDLE_STANDARD_ARGS(GnuTLS REQUIRED_VARS GNUTLS_LIBRARY GNUTLS_INCLUDE_DIR @@ -61,4 +59,3 @@ if(GNUTLS_FOUND) set(GNUTLS_LIBRARIES ${GNUTLS_LIBRARY}) set(GNUTLS_INCLUDE_DIRS ${GNUTLS_INCLUDE_DIR}) endif() - diff --git a/Modules/FindGnuplot.cmake b/Modules/FindGnuplot.cmake index 9ace651..aa4cd6c 100644 --- a/Modules/FindGnuplot.cmake +++ b/Modules/FindGnuplot.cmake @@ -46,12 +46,9 @@ endif() # for compatibility set(GNUPLOT ${GNUPLOT_EXECUTABLE}) -# handle the QUIETLY and REQUIRED arguments and set GNUPLOT_FOUND to TRUE if -# all listed variables are TRUE include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) FIND_PACKAGE_HANDLE_STANDARD_ARGS(Gnuplot REQUIRED_VARS GNUPLOT_EXECUTABLE VERSION_VAR GNUPLOT_VERSION_STRING) mark_as_advanced( GNUPLOT_EXECUTABLE ) - diff --git a/Modules/FindHSPELL.cmake b/Modules/FindHSPELL.cmake index 72d70ad..bb0e2f0 100644 --- a/Modules/FindHSPELL.cmake +++ b/Modules/FindHSPELL.cmake @@ -36,12 +36,9 @@ if (HSPELL_INCLUDE_DIR) unset(HSPELL_H) endif() -# handle the QUIETLY and REQUIRED arguments and set HSPELL_FOUND to TRUE if -# all listed variables are TRUE include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) FIND_PACKAGE_HANDLE_STANDARD_ARGS(HSPELL REQUIRED_VARS HSPELL_LIBRARIES HSPELL_INCLUDE_DIR VERSION_VAR HSPELL_VERSION_STRING) mark_as_advanced(HSPELL_INCLUDE_DIR HSPELL_LIBRARIES) - diff --git a/Modules/FindHg.cmake b/Modules/FindHg.cmake index ef85abc..8aa553e 100644 --- a/Modules/FindHg.cmake +++ b/Modules/FindHg.cmake @@ -90,8 +90,6 @@ if(HG_EXECUTABLE) endmacro(HG_WC_INFO) endif() -# Handle the QUIETLY and REQUIRED arguments and set HG_FOUND to TRUE if -# all listed variables are TRUE include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) find_package_handle_standard_args(Hg REQUIRED_VARS HG_EXECUTABLE diff --git a/Modules/FindIcotool.cmake b/Modules/FindIcotool.cmake index bd3e327..26e95a0 100644 --- a/Modules/FindIcotool.cmake +++ b/Modules/FindIcotool.cmake @@ -39,8 +39,6 @@ if(ICOTOOL_EXECUTABLE) unset(_icotool_version) endif() -# handle the QUIETLY and REQUIRED arguments and set ICOTOOL_FOUND to TRUE if -# all listed variables are TRUE include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) FIND_PACKAGE_HANDLE_STANDARD_ARGS( Icotool diff --git a/Modules/FindJPEG.cmake b/Modules/FindJPEG.cmake index b644181..e233714 100644 --- a/Modules/FindJPEG.cmake +++ b/Modules/FindJPEG.cmake @@ -26,8 +26,6 @@ find_path(JPEG_INCLUDE_DIR jpeglib.h) set(JPEG_NAMES ${JPEG_NAMES} jpeg libjpeg) find_library(JPEG_LIBRARY NAMES ${JPEG_NAMES} ) -# handle the QUIETLY and REQUIRED arguments and set JPEG_FOUND to TRUE if -# all listed variables are TRUE include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) FIND_PACKAGE_HANDLE_STANDARD_ARGS(JPEG DEFAULT_MSG JPEG_LIBRARY JPEG_INCLUDE_DIR) diff --git a/Modules/FindJasper.cmake b/Modules/FindJasper.cmake index 748510e..db76657 100644 --- a/Modules/FindJasper.cmake +++ b/Modules/FindJasper.cmake @@ -34,8 +34,6 @@ 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 () -# handle the QUIETLY and REQUIRED arguments and set JASPER_FOUND to TRUE if -# all listed variables are TRUE include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) FIND_PACKAGE_HANDLE_STANDARD_ARGS(Jasper REQUIRED_VARS JASPER_LIBRARIES JASPER_INCLUDE_DIR JPEG_LIBRARIES diff --git a/Modules/FindJava.cmake b/Modules/FindJava.cmake index e30917d..5c0abb0 100644 --- a/Modules/FindJava.cmake +++ b/Modules/FindJava.cmake @@ -262,4 +262,3 @@ mark_as_advanced( set(JAVA_RUNTIME ${Java_JAVA_EXECUTABLE}) set(JAVA_ARCHIVE ${Java_JAR_EXECUTABLE}) set(JAVA_COMPILE ${Java_JAVAC_EXECUTABLE}) - diff --git a/Modules/FindLATEX.cmake b/Modules/FindLATEX.cmake index 1d8f6ce..d1f4fa4 100644 --- a/Modules/FindLATEX.cmake +++ b/Modules/FindLATEX.cmake @@ -271,7 +271,6 @@ mark_as_advanced( HTLATEX_COMPILER ) -# handle variables for found Latex and its components include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) find_package_handle_standard_args(LATEX REQUIRED_VARS LATEX_COMPILER diff --git a/Modules/FindLTTngUST.cmake b/Modules/FindLTTngUST.cmake index 8781bae..00d5e7a 100644 --- a/Modules/FindLTTngUST.cmake +++ b/Modules/FindLTTngUST.cmake @@ -90,8 +90,6 @@ if(LTTNGUST_INCLUDE_DIRS AND LTTNGUST_LIBRARIES) set(LTTNGUST_LIBRARIES ${LTTNGUST_LIBRARIES} ${CMAKE_DL_LIBS}) endif() -# handle the QUIETLY and REQUIRED arguments and set LTTNGUST_FOUND to -# TRUE if all listed variables are TRUE include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) find_package_handle_standard_args(LTTngUST FOUND_VAR LTTNGUST_FOUND REQUIRED_VARS LTTNGUST_LIBRARIES diff --git a/Modules/FindLibArchive.cmake b/Modules/FindLibArchive.cmake index 4310dac..38e512f 100644 --- a/Modules/FindLibArchive.cmake +++ b/Modules/FindLibArchive.cmake @@ -46,8 +46,6 @@ if(LibArchive_INCLUDE_DIR AND EXISTS "${LibArchive_INCLUDE_DIR}/archive.h") unset(_LibArchive_VERSION_STRING) endif() -# Handle the QUIETLY and REQUIRED arguments and set LIBARCHIVE_FOUND -# to TRUE if all listed variables are TRUE. include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) find_package_handle_standard_args(LibArchive REQUIRED_VARS LibArchive_LIBRARY LibArchive_INCLUDE_DIR diff --git a/Modules/FindLibXml2.cmake b/Modules/FindLibXml2.cmake index 9580981..613f927 100644 --- a/Modules/FindLibXml2.cmake +++ b/Modules/FindLibXml2.cmake @@ -52,8 +52,6 @@ elseif(LIBXML2_INCLUDE_DIR AND EXISTS "${LIBXML2_INCLUDE_DIR}/libxml/xmlversion. unset(libxml2_version_str) endif() -# handle the QUIETLY and REQUIRED arguments and set LIBXML2_FOUND to TRUE if -# all listed variables are TRUE include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibXml2 REQUIRED_VARS LIBXML2_LIBRARIES LIBXML2_INCLUDE_DIR diff --git a/Modules/FindMPEG.cmake b/Modules/FindMPEG.cmake index aff464e..cd1b021 100644 --- a/Modules/FindMPEG.cmake +++ b/Modules/FindMPEG.cmake @@ -34,8 +34,6 @@ find_library( MPEG_vo_LIBRARY vo /usr/local/livid/mpeg2dec/libvo/.libs ) -# handle the QUIETLY and REQUIRED arguments and set MPEG2_FOUND to TRUE if -# all listed variables are TRUE include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) FIND_PACKAGE_HANDLE_STANDARD_ARGS(MPEG DEFAULT_MSG MPEG_INCLUDE_DIR MPEG_mpeg2_LIBRARY MPEG_vo_LIBRARY) diff --git a/Modules/FindMPEG2.cmake b/Modules/FindMPEG2.cmake index e28054d..2c75d7b 100644 --- a/Modules/FindMPEG2.cmake +++ b/Modules/FindMPEG2.cmake @@ -35,9 +35,6 @@ find_library( MPEG2_vo_LIBRARY vo /usr/local/livid/mpeg2dec/libvo/.libs ) - -# handle the QUIETLY and REQUIRED arguments and set MPEG2_FOUND to TRUE if -# all listed variables are TRUE include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) FIND_PACKAGE_HANDLE_STANDARD_ARGS(MPEG2 DEFAULT_MSG MPEG2_mpeg2_LIBRARY MPEG2_INCLUDE_DIR) diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake index 676e1bc..842acef 100644 --- a/Modules/FindMPI.cmake +++ b/Modules/FindMPI.cmake @@ -91,7 +91,6 @@ # # In new projects, please use the ``MPI__XXX`` equivalents. -# include this to handle the QUIETLY and REQUIRED arguments include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) # diff --git a/Modules/FindMotif.cmake b/Modules/FindMotif.cmake index 3923238..7304d95 100644 --- a/Modules/FindMotif.cmake +++ b/Modules/FindMotif.cmake @@ -30,12 +30,9 @@ if(UNIX) endif() -# handle the QUIETLY and REQUIRED arguments and set MOTIF_FOUND to TRUE if -# all listed variables are TRUE include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) FIND_PACKAGE_HANDLE_STANDARD_ARGS(Motif DEFAULT_MSG MOTIF_LIBRARIES MOTIF_INCLUDE_DIR) - mark_as_advanced( MOTIF_INCLUDE_DIR MOTIF_LIBRARIES diff --git a/Modules/FindOpenAL.cmake b/Modules/FindOpenAL.cmake index 1abb0d6..8622b4c 100644 --- a/Modules/FindOpenAL.cmake +++ b/Modules/FindOpenAL.cmake @@ -92,8 +92,6 @@ find_library(OPENAL_LIBRARY unset(_OpenAL_ARCH_DIR) -# handle the QUIETLY and REQUIRED arguments and set OPENAL_FOUND to TRUE if -# all listed variables are TRUE include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenAL DEFAULT_MSG OPENAL_LIBRARY OPENAL_INCLUDE_DIR) diff --git a/Modules/FindOpenGL.cmake b/Modules/FindOpenGL.cmake index e487726..295de65 100644 --- a/Modules/FindOpenGL.cmake +++ b/Modules/FindOpenGL.cmake @@ -156,8 +156,6 @@ endif() # This deprecated setting is for backward compatibility with CMake1.4 set(OPENGL_INCLUDE_PATH ${OPENGL_INCLUDE_DIR}) -# handle the QUIETLY and REQUIRED arguments and set OPENGL_FOUND to TRUE if -# all listed variables are TRUE include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenGL REQUIRED_VARS ${_OpenGL_REQUIRED_VARS}) unset(_OpenGL_REQUIRED_VARS) diff --git a/Modules/FindOpenSceneGraph.cmake b/Modules/FindOpenSceneGraph.cmake index af873fa..425aa45 100644 --- a/Modules/FindOpenSceneGraph.cmake +++ b/Modules/FindOpenSceneGraph.cmake @@ -227,4 +227,3 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenSceneGraph unset(_osg_component_founds) set(OPENSCENEGRAPH_INCLUDE_DIRS ${OPENSCENEGRAPH_INCLUDE_DIR}) - diff --git a/Modules/FindPNG.cmake b/Modules/FindPNG.cmake index 6f94d50..1d5d553 100644 --- a/Modules/FindPNG.cmake +++ b/Modules/FindPNG.cmake @@ -140,8 +140,6 @@ if(ZLIB_FOUND) endif () endif() -# handle the QUIETLY and REQUIRED arguments and set PNG_FOUND to TRUE if -# all listed variables are TRUE include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) find_package_handle_standard_args(PNG REQUIRED_VARS PNG_LIBRARY PNG_PNG_INCLUDE_DIR diff --git a/Modules/FindPerl.cmake b/Modules/FindPerl.cmake index a0c8a33..423fc69 100644 --- a/Modules/FindPerl.cmake +++ b/Modules/FindPerl.cmake @@ -70,8 +70,6 @@ endif() # Deprecated settings for compatibility with CMake1.4 set(PERL ${PERL_EXECUTABLE}) -# handle the QUIETLY and REQUIRED arguments and set PERL_FOUND to TRUE if -# all listed variables are TRUE include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) FIND_PACKAGE_HANDLE_STANDARD_ARGS(Perl REQUIRED_VARS PERL_EXECUTABLE diff --git a/Modules/FindPerlLibs.cmake b/Modules/FindPerlLibs.cmake index 42729d7..e01e75e 100644 --- a/Modules/FindPerlLibs.cmake +++ b/Modules/FindPerlLibs.cmake @@ -239,8 +239,6 @@ if (PERL_EXECUTABLE) endif () -# handle the QUIETLY and REQUIRED arguments and set PERLLIBS_FOUND to TRUE if -# all listed variables are TRUE include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) 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 fe5b397..cfe9b0f 100644 --- a/Modules/FindPhysFS.cmake +++ b/Modules/FindPhysFS.cmake @@ -43,8 +43,5 @@ find_library(PHYSFS_LIBRARY /opt ) -# handle the QUIETLY and REQUIRED arguments and set PHYSFS_FOUND to TRUE if -# all listed variables are TRUE include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) FIND_PACKAGE_HANDLE_STANDARD_ARGS(PhysFS DEFAULT_MSG PHYSFS_LIBRARY PHYSFS_INCLUDE_DIR) - diff --git a/Modules/FindPythonInterp.cmake b/Modules/FindPythonInterp.cmake index 103e820..f255246 100644 --- a/Modules/FindPythonInterp.cmake +++ b/Modules/FindPythonInterp.cmake @@ -145,8 +145,6 @@ if(PYTHON_EXECUTABLE) unset(_VERSION) endif() -# handle the QUIETLY and REQUIRED arguments and set PYTHONINTERP_FOUND to TRUE if -# all listed variables are TRUE include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) FIND_PACKAGE_HANDLE_STANDARD_ARGS(PythonInterp REQUIRED_VARS PYTHON_EXECUTABLE VERSION_VAR PYTHON_VERSION_STRING) diff --git a/Modules/FindQuickTime.cmake b/Modules/FindQuickTime.cmake index 2ee1899..995d882 100644 --- a/Modules/FindQuickTime.cmake +++ b/Modules/FindQuickTime.cmake @@ -29,7 +29,5 @@ find_library(QUICKTIME_LIBRARY QuickTime lib ) -# handle the QUIETLY and REQUIRED arguments and set QUICKTIME_FOUND to TRUE if -# all listed variables are TRUE include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) FIND_PACKAGE_HANDLE_STANDARD_ARGS(QuickTime DEFAULT_MSG QUICKTIME_LIBRARY QUICKTIME_INCLUDE_DIR) diff --git a/Modules/FindTCL.cmake b/Modules/FindTCL.cmake index 12d6616..b6e24a3 100644 --- a/Modules/FindTCL.cmake +++ b/Modules/FindTCL.cmake @@ -205,8 +205,6 @@ find_path(TK_INCLUDE_PATH HINTS ${TCLTK_POSSIBLE_INCLUDE_PATHS} ) -# handle the QUIETLY and REQUIRED arguments and set TCL_FOUND to TRUE if -# all listed variables are TRUE include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) FIND_PACKAGE_HANDLE_STANDARD_ARGS(TCL DEFAULT_MSG TCL_LIBRARY TCL_INCLUDE_PATH) diff --git a/Modules/FindTIFF.cmake b/Modules/FindTIFF.cmake index 23ae308..b622ca6 100644 --- a/Modules/FindTIFF.cmake +++ b/Modules/FindTIFF.cmake @@ -65,8 +65,6 @@ if(TIFF_INCLUDE_DIR AND EXISTS "${TIFF_INCLUDE_DIR}/tiffvers.h") unset(tiff_version_str) endif() -# handle the QUIETLY and REQUIRED arguments and set TIFF_FOUND to TRUE if -# all listed variables are TRUE include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) FIND_PACKAGE_HANDLE_STANDARD_ARGS(TIFF REQUIRED_VARS TIFF_LIBRARY TIFF_INCLUDE_DIR diff --git a/Modules/FindTclsh.cmake b/Modules/FindTclsh.cmake index c8a87ec..9fcb41c 100644 --- a/Modules/FindTclsh.cmake +++ b/Modules/FindTclsh.cmake @@ -89,8 +89,6 @@ if(TCL_TCLSH) OUTPUT_STRIP_TRAILING_WHITESPACE) endif() -# handle the QUIETLY and REQUIRED arguments and set TIFF_FOUND to TRUE if -# all listed variables are TRUE include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) FIND_PACKAGE_HANDLE_STANDARD_ARGS(Tclsh REQUIRED_VARS TCL_TCLSH diff --git a/Modules/FindWget.cmake b/Modules/FindWget.cmake index 68419e2..4fcb2fa 100644 --- a/Modules/FindWget.cmake +++ b/Modules/FindWget.cmake @@ -21,8 +21,6 @@ find_program(WGET_EXECUTABLE ${CYGWIN_INSTALL_PATH}/bin ) -# handle the QUIETLY and REQUIRED arguments and set WGET_FOUND to TRUE if -# all listed variables are TRUE include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) FIND_PACKAGE_HANDLE_STANDARD_ARGS(Wget DEFAULT_MSG WGET_EXECUTABLE) @@ -30,4 +28,4 @@ mark_as_advanced( WGET_EXECUTABLE ) # WGET option is deprecated. # use WGET_EXECUTABLE instead. -set (WGET ${WGET_EXECUTABLE} ) +set (WGET ${WGET_EXECUTABLE}) diff --git a/Modules/FindZLIB.cmake b/Modules/FindZLIB.cmake index 5ee55b3..4065999 100644 --- a/Modules/FindZLIB.cmake +++ b/Modules/FindZLIB.cmake @@ -108,8 +108,6 @@ if(ZLIB_INCLUDE_DIR AND EXISTS "${ZLIB_INCLUDE_DIR}/zlib.h") set(ZLIB_PATCH_VERSION "${ZLIB_VERSION_PATCH}") endif() -# handle the QUIETLY and REQUIRED arguments and set ZLIB_FOUND to TRUE if -# all listed variables are TRUE include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZLIB REQUIRED_VARS ZLIB_LIBRARY ZLIB_INCLUDE_DIR VERSION_VAR ZLIB_VERSION_STRING) -- cgit v0.12