From 2bf8a7dce9ec4587317afa71811dabd5ae75564a Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Thu, 21 Aug 2014 16:38:49 +0200
Subject: [PATCH] Include FindPackageHandleStandardArgs.cmake in every find
module using it
It just worked so far because FindCXX11 happend to include it
already, and it also happend to be the first FindModule used.
---
cmake/Modules/FindAppKit.cmake | 1 +
cmake/Modules/FindCXX11.cmake | 2 +-
cmake/Modules/FindFreetype.cmake | 1 +
cmake/Modules/FindIconv.cmake | 1 +
cmake/Modules/FindJansson.cmake | 1 +
cmake/Modules/FindLibavcodec.cmake | 1 +
cmake/Modules/FindLibavformat.cmake | 1 +
cmake/Modules/FindLibavutil.cmake | 1 +
cmake/Modules/FindLibfdk.cmake | 1 +
cmake/Modules/FindLibswresample.cmake | 1 +
cmake/Modules/FindLibswscale.cmake | 1 +
cmake/Modules/FindLibv4l2.cmake | 1 +
cmake/Modules/FindLibx264.cmake | 1 +
13 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/cmake/Modules/FindAppKit.cmake b/cmake/Modules/FindAppKit.cmake
index c401a1184..355232160 100644
--- a/cmake/Modules/FindAppKit.cmake
+++ b/cmake/Modules/FindAppKit.cmake
@@ -11,6 +11,7 @@ else()
set(AppKit_LIBRARIES ${APPKIT_FRAMEWORK} CACHE STRING "AppKit framework")
+ include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(AppKit DEFAULT_MSG APPKIT_FRAMEWORK)
mark_as_advanced(APPKIT_FRAMEWORK)
endif()
diff --git a/cmake/Modules/FindCXX11.cmake b/cmake/Modules/FindCXX11.cmake
index 64e4da406..a62777558 100644
--- a/cmake/Modules/FindCXX11.cmake
+++ b/cmake/Modules/FindCXX11.cmake
@@ -13,7 +13,6 @@ if(CXX11_FLAGS)
endif()
include(CheckCXXSourceCompiles)
-include(FindPackageHandleStandardArgs)
if(MSVC)
set(CXX11_FLAG_CANDIDATES
@@ -64,5 +63,6 @@ endforeach(FLAG ${CXX11_FLAG_CANDIDATES})
set(CXX11_FLAGS "${CXX11_FLAGS_INTERNAL}" CACHE STRING "C++11 Flags")
+include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(CXX11 DEFAULT_MSG CXX11_FLAGS)
mark_as_advanced(CXX11_FLAGS)
diff --git a/cmake/Modules/FindFreetype.cmake b/cmake/Modules/FindFreetype.cmake
index 50ee27352..26f2484d9 100644
--- a/cmake/Modules/FindFreetype.cmake
+++ b/cmake/Modules/FindFreetype.cmake
@@ -75,6 +75,7 @@ else()
set(FREETYPE_INCLUDE_DIRS ${FREETYPE_INCLUDE_DIR} CACHE PATH "freetype include dirs")
set(FREETYPE_LIBRARIES ${FREETYPE_LIB} CACHE STRING "freetype libraries")
+ include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Freetype DEFAULT_MSG FREETYPE_LIB FREETYPE_INCLUDE_DIR_ft2build FREETYPE_INCLUDE_DIR_freetype2)
mark_as_advanced(FREETYPE_INCLUDE_DIR FREETYPE_INCLUDE_DIR_ft2build FREETYPE_INCLUDE_DIR_freetype2 FREETYPE_LIB)
endif()
diff --git a/cmake/Modules/FindIconv.cmake b/cmake/Modules/FindIconv.cmake
index ad0555cce..7dd65c316 100644
--- a/cmake/Modules/FindIconv.cmake
+++ b/cmake/Modules/FindIconv.cmake
@@ -47,6 +47,7 @@ else()
set(ICONV_INCLUDE_DIRS ${ICONV_INCLUDE_DIR} CACHE PATH "iconv include dir")
set(ICONV_LIBRARIES ${ICONV_LIB} CACHE STRING "iconv libraries")
+ include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Iconv DEFAULT_MSG ICONV_LIB ICONV_INCLUDE_DIR)
mark_as_advanced(ICONV_INCLUDE_DIR ICONV_LIB)
endif()
diff --git a/cmake/Modules/FindJansson.cmake b/cmake/Modules/FindJansson.cmake
index 383a4c6e2..d3b7812c4 100644
--- a/cmake/Modules/FindJansson.cmake
+++ b/cmake/Modules/FindJansson.cmake
@@ -61,6 +61,7 @@ else()
set(JANSSON_LIBRARIES ${Jansson_LIB} CACHE STRING "Jansson libraries")
set(JANSSON_VERSION "${_JANSSON_VERSION_STRING}" CACHE STRING "Jansson version")
+ include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Jansson
FOUND_VAR JANSSON_FOUND
REQUIRED_VARS Jansson_LIB Jansson_INCLUDE_DIR
diff --git a/cmake/Modules/FindLibavcodec.cmake b/cmake/Modules/FindLibavcodec.cmake
index 56ca0c143..f81f50e5c 100644
--- a/cmake/Modules/FindLibavcodec.cmake
+++ b/cmake/Modules/FindLibavcodec.cmake
@@ -52,6 +52,7 @@ else()
set(LIBAVCODEC_INCLUDE_DIRS ${FFMPEG_INCLUDE_DIR} CACHE PATH "Libavcodec include dir")
set(LIBAVCODEC_LIBRARIES ${AVCODEC_LIB} CACHE STRING "Libavcodec libraries")
+ include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Libavcodec DEFAULT_MSG AVCODEC_LIB FFMPEG_INCLUDE_DIR)
mark_as_advanced(FFMPEG_INCLUDE_DIR AVCODEC_LIB)
endif()
diff --git a/cmake/Modules/FindLibavformat.cmake b/cmake/Modules/FindLibavformat.cmake
index 21f41bfad..bf1e130d3 100644
--- a/cmake/Modules/FindLibavformat.cmake
+++ b/cmake/Modules/FindLibavformat.cmake
@@ -48,6 +48,7 @@ else()
set(LIBAVFORMAT_INCLUDE_DIRS ${FFMPEG_INCLUDE_DIR} CACHE PATH "Libavformat include dir")
set(LIBAVFORMAT_LIBRARIES ${AVFORMAT_LIB} CACHE STRING "Libavformat libraries")
+ include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Libavformat DEFAULT_MSG AVFORMAT_LIB FFMPEG_INCLUDE_DIR)
mark_as_advanced(FFMPEG_INCLUDE_DIR AVFORMAT_LIB)
endif()
diff --git a/cmake/Modules/FindLibavutil.cmake b/cmake/Modules/FindLibavutil.cmake
index cc69fb606..623c5d69b 100644
--- a/cmake/Modules/FindLibavutil.cmake
+++ b/cmake/Modules/FindLibavutil.cmake
@@ -48,6 +48,7 @@ else()
set(LIBAVUTIL_INCLUDE_DIRS ${FFMPEG_INCLUDE_DIR} CACHE PATH "Libavutil include dir")
set(LIBAVUTIL_LIBRARIES ${AVUTIL_LIB} CACHE STRING "Libavutil libraries")
+ include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Libavutil DEFAULT_MSG AVUTIL_LIB FFMPEG_INCLUDE_DIR)
mark_as_advanced(FFMPEG_INCLUDE_DIR AVUTIL_LIB)
endif()
diff --git a/cmake/Modules/FindLibfdk.cmake b/cmake/Modules/FindLibfdk.cmake
index da9768d44..6d6587729 100644
--- a/cmake/Modules/FindLibfdk.cmake
+++ b/cmake/Modules/FindLibfdk.cmake
@@ -54,6 +54,7 @@ else()
set(LIBFDK_INCLUDE_DIRS ${Libfdk_INCLUDE_DIR} CACHE PATH "Libfdk include dir")
set(LIBFDK_LIBRARIES ${Libfdk_LIB} CACHE STRING "Libfdk libraries")
+ include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Libfdk DEFAULT_MSG Libfdk_LIB Libfdk_INCLUDE_DIR)
mark_as_advanced(Libfdk_INCLUDE_DIR Libfdk_LIB)
endif()
diff --git a/cmake/Modules/FindLibswresample.cmake b/cmake/Modules/FindLibswresample.cmake
index 69c1a94ff..0e8986d26 100644
--- a/cmake/Modules/FindLibswresample.cmake
+++ b/cmake/Modules/FindLibswresample.cmake
@@ -48,6 +48,7 @@ else()
set(LIBSWRESAMPLE_INCLUDE_DIRS ${FFMPEG_INCLUDE_DIR} CACHE PATH "Libswresample include dir")
set(LIBSWRESAMPLE_LIBRARIES ${SWRESAMPLE_LIB} CACHE STRING "Libswresample libraries")
+ include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Libswresample DEFAULT_MSG SWRESAMPLE_LIB FFMPEG_INCLUDE_DIR)
mark_as_advanced(FFMPEG_INCLUDE_DIR SWRESAMPLE_LIB)
endif()
diff --git a/cmake/Modules/FindLibswscale.cmake b/cmake/Modules/FindLibswscale.cmake
index 83c351744..40540a963 100644
--- a/cmake/Modules/FindLibswscale.cmake
+++ b/cmake/Modules/FindLibswscale.cmake
@@ -48,6 +48,7 @@ else()
set(LIBSWSCALE_INCLUDE_DIRS ${FFMPEG_INCLUDE_DIR} CACHE PATH "Libswscale include dir")
set(LIBSWSCALE_LIBRARIES ${SWSCALE_LIB} CACHE STRING "Libswscale libraries")
+ include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Libswscale DEFAULT_MSG SWSCALE_LIB FFMPEG_INCLUDE_DIR)
mark_as_advanced(FFMPEG_INCLUDE_DIR SWSCALE_LIB)
endif()
diff --git a/cmake/Modules/FindLibv4l2.cmake b/cmake/Modules/FindLibv4l2.cmake
index f4a0076a2..de2b3774a 100644
--- a/cmake/Modules/FindLibv4l2.cmake
+++ b/cmake/Modules/FindLibv4l2.cmake
@@ -28,6 +28,7 @@ else()
set(LIBV4L2_LIBRARIES "${V4L2_LIB}"
CACHE STRING "v4l2 libraries")
+ include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(LibV4L2 DEFAULT_MSG V4L2_LIB
V4L2_INCLUDE_DIR)
mark_as_advanced(V4L2_INCLUDE_DIR V4L2_LIB)
diff --git a/cmake/Modules/FindLibx264.cmake b/cmake/Modules/FindLibx264.cmake
index 657147157..4434b69c7 100644
--- a/cmake/Modules/FindLibx264.cmake
+++ b/cmake/Modules/FindLibx264.cmake
@@ -54,6 +54,7 @@ else()
set(LIBX264_INCLUDE_DIRS ${X264_INCLUDE_DIR} CACHE PATH "x264 include dir")
set(LIBX264_LIBRARIES ${X264_LIB} CACHE STRING "x264 libraries")
+ include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Libx264 DEFAULT_MSG X264_LIB X264_INCLUDE_DIR)
mark_as_advanced(X264_INCLUDE_DIR X264_LIB)
endif()
--
GitLab