aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRechi <Rechi@users.noreply.github.com>2017-03-27 17:45:05 +0200
committerRechi <Rechi@users.noreply.github.com>2017-03-27 17:45:05 +0200
commitc1668a8bcdb03fc90bd1f1ba2b4c994c4adb3773 (patch)
treec23b37d384694848b4e63fb6c572ba8415fa47d9
parent0912596778b1e14bf3a27664b5f4ab7a937a10fc (diff)
[cmake] fix package names that find_package is equal to find_package_handle_standard_args
-rw-r--r--CMakeLists.txt2
-rw-r--r--cmake/modules/FindAlsa.cmake2
-rw-r--r--cmake/modules/FindCCache.cmake2
-rw-r--r--cmake/modules/FindCdio.cmake2
-rw-r--r--cmake/modules/FindCpluff.cmake2
-rw-r--r--cmake/modules/FindCrossGUID.cmake4
-rw-r--r--cmake/modules/FindFriBidi.cmake (renamed from cmake/modules/FindFribidi.cmake)0
-rw-r--r--cmake/modules/FindLibDvd.cmake4
-rw-r--r--cmake/modules/FindMDNS.cmake2
-rw-r--r--cmake/modules/FindPlist.cmake4
-rw-r--r--cmake/modules/FindPython.cmake2
-rw-r--r--cmake/modules/FindZip.cmake2
12 files changed, 14 insertions, 14 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 49ba54230e..6ff1be99ae 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -107,7 +107,7 @@ set(required_deps Cdio
FFMPEG
Fmt
FreeType
- Fribidi
+ FriBidi
LibDvd
Lzo2
PCRE
diff --git a/cmake/modules/FindAlsa.cmake b/cmake/modules/FindAlsa.cmake
index a2822431f8..c99f50936d 100644
--- a/cmake/modules/FindAlsa.cmake
+++ b/cmake/modules/FindAlsa.cmake
@@ -26,7 +26,7 @@ find_library(ALSA_LIBRARY NAMES asound
set(ALSA_VERSION ${PC_ALSA_VERSION})
include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(ALSA
+find_package_handle_standard_args(Alsa
REQUIRED_VARS ALSA_LIBRARY ALSA_INCLUDE_DIR
VERSION_VAR ALSA_VERSION)
diff --git a/cmake/modules/FindCCache.cmake b/cmake/modules/FindCCache.cmake
index a7fd29faba..956dee218d 100644
--- a/cmake/modules/FindCCache.cmake
+++ b/cmake/modules/FindCCache.cmake
@@ -9,7 +9,7 @@
find_program(CCACHE_PROGRAM ccache)
include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(CCACHE REQUIRED_VARS CCACHE_PROGRAM)
+find_package_handle_standard_args(CCache REQUIRED_VARS CCACHE_PROGRAM)
if(CCACHE_FOUND)
# Supports Unix Makefiles and Ninja
diff --git a/cmake/modules/FindCdio.cmake b/cmake/modules/FindCdio.cmake
index 1f3dee3ba6..3f0a8678d9 100644
--- a/cmake/modules/FindCdio.cmake
+++ b/cmake/modules/FindCdio.cmake
@@ -26,7 +26,7 @@ find_library(CDIO_LIBRARY NAMES cdio libcdio
set(CDIO_VERSION ${PC_CDIO_libcdio_VERSION})
include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(CDIO
+find_package_handle_standard_args(Cdio
REQUIRED_VARS CDIO_LIBRARY CDIO_INCLUDE_DIR
VERSION_VAR CDIO_VERSION)
diff --git a/cmake/modules/FindCpluff.cmake b/cmake/modules/FindCpluff.cmake
index 3705bd8196..e08711a144 100644
--- a/cmake/modules/FindCpluff.cmake
+++ b/cmake/modules/FindCpluff.cmake
@@ -48,7 +48,7 @@ else()
find_path(CPLUFF_INCLUDE_DIR cpluff.h)
include(FindPackageHandleStandardArgs)
- find_package_handle_standard_args(CPLUFF
+ find_package_handle_standard_args(Cpluff
REQUIRED_VARS CPLUFF_INCLUDE_DIR)
if(CPLUFF_FOUND)
diff --git a/cmake/modules/FindCrossGUID.cmake b/cmake/modules/FindCrossGUID.cmake
index 0f0d72099a..7384747b20 100644
--- a/cmake/modules/FindCrossGUID.cmake
+++ b/cmake/modules/FindCrossGUID.cmake
@@ -42,7 +42,7 @@ if(ENABLE_INTERNAL_CROSSGUID)
set_target_properties(crossguid PROPERTIES FOLDER "External Projects")
include(FindPackageHandleStandardArgs)
- find_package_handle_standard_args(CrossGuid
+ find_package_handle_standard_args(CrossGUID
REQUIRED_VARS CROSSGUID_LIBRARY CROSSGUID_INCLUDE_DIR
VERSION_VAR CGUID_VER)
@@ -58,7 +58,7 @@ else()
select_library_configurations(CROSSGUID)
include(FindPackageHandleStandardArgs)
- find_package_handle_standard_args(CrossGuid
+ find_package_handle_standard_args(CrossGUID
REQUIRED_VARS CROSSGUID_LIBRARY CROSSGUID_INCLUDE_DIR)
if(CROSSGUID_FOUND)
diff --git a/cmake/modules/FindFribidi.cmake b/cmake/modules/FindFriBidi.cmake
index dcaeb48b7d..dcaeb48b7d 100644
--- a/cmake/modules/FindFribidi.cmake
+++ b/cmake/modules/FindFriBidi.cmake
diff --git a/cmake/modules/FindLibDvd.cmake b/cmake/modules/FindLibDvd.cmake
index 9545489b30..eeb416c2a5 100644
--- a/cmake/modules/FindLibDvd.cmake
+++ b/cmake/modules/FindLibDvd.cmake
@@ -19,7 +19,7 @@ if(NOT WIN32)
endif()
include(FindPackageHandleStandardArgs)
- find_package_handle_standard_args(LIBDVD REQUIRED_VARS ${_handlevars})
+ find_package_handle_standard_args(LibDvd REQUIRED_VARS ${_handlevars})
if(LIBDVD_FOUND)
add_library(dvdnav UNKNOWN IMPORTED)
set_target_properties(dvdnav PROPERTIES
@@ -206,7 +206,7 @@ else()
find_path(LIBDVD_INCLUDE_DIR dvdcss/dvdcss.h PATHS ${CMAKE_SOURCE_DIR}/lib/libdvd/include)
include(FindPackageHandleStandardArgs)
- find_package_handle_standard_args(LIBDVD REQUIRED_VARS LIBDVD_INCLUDE_DIR)
+ find_package_handle_standard_args(LibDvd REQUIRED_VARS LIBDVD_INCLUDE_DIR)
if(LIBDVD_FOUND)
set(LIBDVD_INCLUDE_DIRS ${LIBDVD_INCLUDE_DIR})
diff --git a/cmake/modules/FindMDNS.cmake b/cmake/modules/FindMDNS.cmake
index 59416b3d61..c001f7bb5a 100644
--- a/cmake/modules/FindMDNS.cmake
+++ b/cmake/modules/FindMDNS.cmake
@@ -20,7 +20,7 @@ find_library(MDNS_LIBRARY NAMES mDNSEmbedded dnssd)
find_path(MDNS_EMBEDDED_INCLUDE_DIR NAMES mDnsEmbedded.h)
include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(mDNS
+find_package_handle_standard_args(MDNS
REQUIRED_VARS MDNS_LIBRARY MDNS_INCLUDE_DIR)
if(MDNS_FOUND)
diff --git a/cmake/modules/FindPlist.cmake b/cmake/modules/FindPlist.cmake
index d7a6c48e36..862da4658e 100644
--- a/cmake/modules/FindPlist.cmake
+++ b/cmake/modules/FindPlist.cmake
@@ -28,12 +28,12 @@ if(NOT WIN32)
find_library(PLIST_LIBRARY NAMES plist
PATHS ${PC_PLIST_LIBDIR})
- find_package_handle_standard_args(PLIST
+ find_package_handle_standard_args(Plist
REQUIRED_VARS PLIST_LIBRARY PLIST_INCLUDE_DIR
VERSION_VAR PLIST_VERSION)
else()
# Dynamically loaded DLL
- find_package_handle_standard_args(PLIST
+ find_package_handle_standard_args(Plist
REQUIRED_VARS PLIST_INCLUDE_DIR
VERSION_VAR PLIST_VERSION)
endif()
diff --git a/cmake/modules/FindPython.cmake b/cmake/modules/FindPython.cmake
index 4f1b49abe0..213b17c629 100644
--- a/cmake/modules/FindPython.cmake
+++ b/cmake/modules/FindPython.cmake
@@ -30,7 +30,7 @@ else()
endif()
include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(PYTHON REQUIRED_VARS PYTHON_INCLUDE_DIR PYTHON_LIBRARY PYTHON_LIBRARIES)
+find_package_handle_standard_args(Python REQUIRED_VARS PYTHON_INCLUDE_DIR PYTHON_LIBRARY PYTHON_LIBRARIES)
if(PYTHON_FOUND)
set(PYTHON_INCLUDE_DIRS ${PYTHON_INCLUDE_DIR})
list(APPEND PYTHON_DEFINITIONS -DHAS_PYTHON=1)
diff --git a/cmake/modules/FindZip.cmake b/cmake/modules/FindZip.cmake
index e0a38c1290..ecac26250c 100644
--- a/cmake/modules/FindZip.cmake
+++ b/cmake/modules/FindZip.cmake
@@ -25,7 +25,7 @@ find_library(ZIP_LIBRARY NAMES zip
set(ZIP_VERSION ${PC_ZIP_VERSION})
include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(ZIP
+find_package_handle_standard_args(Zip
REQUIRED_VARS ZIP_LIBRARY ZIP_INCLUDE_DIR
VERSION_VAR ZIP_VERSION)