CMake: prevent mismatched package name warnings

Use all caps for the packages.

Closes https://github.com/wxWidgets/wxWidgets/pull/1886
This commit is contained in:
Maarten Bent
2020-06-06 18:08:53 +02:00
committed by Vadim Zeitlin
parent f72f2bec3a
commit 1ed8197dfa
12 changed files with 26 additions and 26 deletions

View File

@@ -317,7 +317,7 @@ if(UNIX)
if(wxUSE_SECRETSTORE AND NOT APPLE) if(wxUSE_SECRETSTORE AND NOT APPLE)
# The required APIs are always available under MSW and OS X but we must # The required APIs are always available under MSW and OS X but we must
# have GNOME libsecret under Unix to be able to compile this class. # have GNOME libsecret under Unix to be able to compile this class.
find_package(Libsecret) find_package(LIBSECRET)
if(NOT LIBSECRET_FOUND) if(NOT LIBSECRET_FOUND)
message(WARNING "libsecret not found, wxSecretStore won't be available") message(WARNING "libsecret not found, wxSecretStore won't be available")
wx_option_force_value(wxUSE_SECRETSTORE OFF) wx_option_force_value(wxUSE_SECRETSTORE OFF)
@@ -325,7 +325,7 @@ if(UNIX)
endif() endif()
if(wxUSE_LIBICONV) if(wxUSE_LIBICONV)
find_package(Iconv) find_package(ICONV)
if(NOT ICONV_FOUND) if(NOT ICONV_FOUND)
message(WARNING "iconv not found") message(WARNING "iconv not found")
wx_option_force_value(wxUSE_LIBICONV OFF) wx_option_force_value(wxUSE_LIBICONV OFF)
@@ -395,13 +395,13 @@ if(wxUSE_GUI)
if(wxUSE_WEBVIEW) if(wxUSE_WEBVIEW)
if(WXGTK) if(WXGTK)
if(wxUSE_WEBVIEW_WEBKIT) if(wxUSE_WEBVIEW_WEBKIT)
find_package(LibSoup) find_package(LIBSOUP)
if(WXGTK2) if(WXGTK2)
find_package(Webkit 1.0) find_package(WEBKIT 1.0)
elseif(WXGTK3) elseif(WXGTK3)
find_package(Webkit2) find_package(WEBKIT2)
if(NOT WEBKIT2_FOUND) if(NOT WEBKIT2_FOUND)
find_package(Webkit 3.0) find_package(WEBKIT 3.0)
endif() endif()
endif() endif()
endif() endif()
@@ -429,8 +429,8 @@ if(wxUSE_GUI)
endif() endif()
if(wxUSE_PRIVATE_FONTS AND WXGTK) if(wxUSE_PRIVATE_FONTS AND WXGTK)
find_package(Fontconfig) find_package(FONTCONFIG)
find_package(PangoFT2) find_package(PANGOFT2)
if(NOT FONTCONFIG_FOUND OR NOT PANGOFT2_FOUND) if(NOT FONTCONFIG_FOUND OR NOT PANGOFT2_FOUND)
message(WARNING "Fontconfig or PangoFT2 not found, Private fonts won't be available") message(WARNING "Fontconfig or PangoFT2 not found, Private fonts won't be available")
wx_option_force_value(wxUSE_PRIVATE_FONTS OFF) wx_option_force_value(wxUSE_PRIVATE_FONTS OFF)
@@ -438,9 +438,9 @@ if(wxUSE_GUI)
endif() endif()
if(wxUSE_MEDIACTRL AND UNIX AND NOT APPLE AND NOT WIN32) if(wxUSE_MEDIACTRL AND UNIX AND NOT APPLE AND NOT WIN32)
find_package(GStreamer 1.0 COMPONENTS video) find_package(GSTREAMER 1.0 COMPONENTS video)
if(NOT GSTREAMER_FOUND) if(NOT GSTREAMER_FOUND)
find_package(GStreamer 0.10 COMPONENTS interfaces) find_package(GSTREAMER 0.10 COMPONENTS interfaces)
endif() endif()
set(wxUSE_GSTREAMER ${GSTREAMER_FOUND}) set(wxUSE_GSTREAMER ${GSTREAMER_FOUND})
@@ -472,7 +472,7 @@ if(wxUSE_GUI)
endif() endif()
if(wxUSE_NOTIFICATION_MESSAGE AND UNIX AND WXGTK2 AND wxUSE_LIBNOTIFY) if(wxUSE_NOTIFICATION_MESSAGE AND UNIX AND WXGTK2 AND wxUSE_LIBNOTIFY)
find_package(LibNotify) find_package(LIBNOTIFY)
if(NOT LIBNOTIFY_FOUND) if(NOT LIBNOTIFY_FOUND)
message(WARNING "Libnotify not found, it won't be used for notifications") message(WARNING "Libnotify not found, it won't be used for notifications")
wx_option_force_value(wxUSE_LIBNOTIFY OFF) wx_option_force_value(wxUSE_LIBNOTIFY OFF)
@@ -485,7 +485,7 @@ if(wxUSE_GUI)
if(wxUSE_UIACTIONSIMULATOR AND UNIX AND WXGTK) if(wxUSE_UIACTIONSIMULATOR AND UNIX AND WXGTK)
if(wxUSE_XTEST) if(wxUSE_XTEST)
find_package(XTest) find_package(XTEST)
if(XTEST_FOUND) if(XTEST_FOUND)
list(APPEND wxTOOLKIT_INCLUDE_DIRS ${XTEST_INCLUDE_DIRS}) list(APPEND wxTOOLKIT_INCLUDE_DIRS ${XTEST_INCLUDE_DIRS})
list(APPEND wxTOOLKIT_LIBRARIES ${XTEST_LIBRARIES}) list(APPEND wxTOOLKIT_LIBRARIES ${XTEST_LIBRARIES})
@@ -518,7 +518,7 @@ if(wxUSE_GUI)
endif() endif()
if(WXGTK2 AND wxUSE_MIMETYPE AND wxUSE_LIBGNOMEVFS) if(WXGTK2 AND wxUSE_MIMETYPE AND wxUSE_LIBGNOMEVFS)
find_package(GnomeVFS2) find_package(GNOMEVFS2)
if(GNOMEVFS2_FOUND) if(GNOMEVFS2_FOUND)
list(APPEND wxTOOLKIT_INCLUDE_DIRS ${GNOMEVFS2_INCLUDE_DIRS}) list(APPEND wxTOOLKIT_INCLUDE_DIRS ${GNOMEVFS2_INCLUDE_DIRS})
list(APPEND wxTOOLKIT_LIBRARIES ${GNOMEVFS2_LIBRARIES}) list(APPEND wxTOOLKIT_LIBRARIES ${GNOMEVFS2_LIBRARIES})

View File

@@ -74,13 +74,13 @@ else (GNOMEVFS2_LIBRARIES AND GNOMEVFS2_INCLUDE_DIRS)
endif (GNOMEVFS2_INCLUDE_DIRS AND GNOMEVFS2_LIBRARIES) endif (GNOMEVFS2_INCLUDE_DIRS AND GNOMEVFS2_LIBRARIES)
if (GNOMEVFS2_FOUND) if (GNOMEVFS2_FOUND)
if (NOT GnomeVFS2_FIND_QUIETLY) if (NOT GNOMEVFS2_FIND_QUIETLY)
message(STATUS "Found GnomeVFS2: ${GNOMEVFS2_LIBRARIES}") message(STATUS "Found GnomeVFS2: ${GNOMEVFS2_LIBRARIES}")
endif (NOT GnomeVFS2_FIND_QUIETLY) endif (NOT GNOMEVFS2_FIND_QUIETLY)
else (GNOMEVFS2_FOUND) else (GNOMEVFS2_FOUND)
if (GnomeVFS2_FIND_REQUIRED) if (GnomeVFS2_FIND_REQUIRED)
message(FATAL_ERROR "Could not find GnomeVFS2") message(FATAL_ERROR "Could not find GnomeVFS2")
endif (GnomeVFS2_FIND_REQUIRED) endif (GNOMEVFS2_FIND_REQUIRED)
endif (GNOMEVFS2_FOUND) endif (GNOMEVFS2_FOUND)
# show the GNOMEVFS2_INCLUDE_DIRS and GNOMEVFS2_LIBRARIES variables only in the advanced view # show the GNOMEVFS2_INCLUDE_DIRS and GNOMEVFS2_LIBRARIES variables only in the advanced view

View File

@@ -51,7 +51,7 @@ find_package(PkgConfig)
# Determine the version in the library name, default is 1.0 # Determine the version in the library name, default is 1.0
set(GST_LIB_VERSION 1.0) set(GST_LIB_VERSION 1.0)
if(DEFINED GStreamer_FIND_VERSION AND GStreamer_FIND_VERSION VERSION_LESS 1.0) if(DEFINED GSTREAMER_FIND_VERSION AND GSTREAMER_FIND_VERSION VERSION_LESS 1.0)
set(GST_LIB_VERSION 0.10) set(GST_LIB_VERSION 0.10)
endif() endif()
@@ -120,7 +120,7 @@ FIND_GSTREAMER_COMPONENT(GSTREAMER_PLAYER gstreamer-player gst/player/player.h g
# ------------------------------------------------ # ------------------------------------------------
set(_GSTREAMER_REQUIRED_VARS GSTREAMER_VERSION GSTREAMER_INCLUDE_DIRS GSTREAMER_LIBRARIES GSTREAMER_BASE_INCLUDE_DIRS GSTREAMER_BASE_LIBRARIES) set(_GSTREAMER_REQUIRED_VARS GSTREAMER_VERSION GSTREAMER_INCLUDE_DIRS GSTREAMER_LIBRARIES GSTREAMER_BASE_INCLUDE_DIRS GSTREAMER_BASE_LIBRARIES)
foreach (_component ${GStreamer_FIND_COMPONENTS}) foreach (_component ${GSTREAMER_FIND_COMPONENTS})
set(_gst_component "GSTREAMER_${_component}") set(_gst_component "GSTREAMER_${_component}")
string(TOUPPER ${_gst_component} _UPPER_NAME) string(TOUPPER ${_gst_component} _UPPER_NAME)
@@ -128,4 +128,4 @@ foreach (_component ${GStreamer_FIND_COMPONENTS})
endforeach () endforeach ()
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(GStreamer DEFAULT_MSG ${_GSTREAMER_REQUIRED_VARS}) FIND_PACKAGE_HANDLE_STANDARD_ARGS(GSTREAMER DEFAULT_MSG ${_GSTREAMER_REQUIRED_VARS})

View File

@@ -49,9 +49,9 @@ IF(ICONV_FOUND)
MESSAGE(STATUS "Found Iconv: ${ICONV_LIBRARIES}") MESSAGE(STATUS "Found Iconv: ${ICONV_LIBRARIES}")
ENDIF(NOT ICONV_FIND_QUIETLY) ENDIF(NOT ICONV_FIND_QUIETLY)
ELSE(ICONV_FOUND) ELSE(ICONV_FOUND)
IF(Iconv_FIND_REQUIRED) IF(ICONV_FIND_REQUIRED)
MESSAGE(FATAL_ERROR "Could not find Iconv") MESSAGE(FATAL_ERROR "Could not find Iconv")
ENDIF(Iconv_FIND_REQUIRED) ENDIF(ICONV_FIND_REQUIRED)
ENDIF(ICONV_FOUND) ENDIF(ICONV_FOUND)
MARK_AS_ADVANCED( MARK_AS_ADVANCED(

View File

@@ -46,7 +46,7 @@ find_library(LIBNOTIFY_LIBRARIES
) )
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibNotify REQUIRED_VARS LIBNOTIFY_INCLUDE_DIRS LIBNOTIFY_LIBRARIES FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBNOTIFY REQUIRED_VARS LIBNOTIFY_INCLUDE_DIRS LIBNOTIFY_LIBRARIES
VERSION_VAR LIBNOTIFY_VERSION) VERSION_VAR LIBNOTIFY_VERSION)
mark_as_advanced( mark_as_advanced(

View File

@@ -50,7 +50,7 @@ if(PC_LIBSOUP_FOUND)
endif() endif()
INCLUDE(FindPackageHandleStandardArgs) INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibSoup REQUIRED_VARS LIBSOUP_INCLUDE_DIRS LIBSOUP_LIBRARIES FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBSOUP REQUIRED_VARS LIBSOUP_INCLUDE_DIRS LIBSOUP_LIBRARIES
VERSION_VAR PC_LIBSOUP_VERSION) VERSION_VAR PC_LIBSOUP_VERSION)
mark_as_advanced(LIBSOUP_LIBRARIES LIBSOUP_INCLUDE_DIRS) mark_as_advanced(LIBSOUP_LIBRARIES LIBSOUP_INCLUDE_DIRS)

View File

@@ -6,8 +6,8 @@
# WEBKIT_FOUND - True if Webkit found. # WEBKIT_FOUND - True if Webkit found.
SET(WEBKIT_VERSION 1.0) SET(WEBKIT_VERSION 1.0)
if(DEFINED Webkit_FIND_VERSION) if(DEFINED WEBKIT_FIND_VERSION)
SET(WEBKIT_VERSION ${Webkit_FIND_VERSION}) SET(WEBKIT_VERSION ${WEBKIT_FIND_VERSION})
endif() endif()
SET(WEBKIT_INCLUDE_DIR WEBKIT_INCLUDE_DIR-NOTFOUND) SET(WEBKIT_INCLUDE_DIR WEBKIT_INCLUDE_DIR-NOTFOUND)

View File

@@ -40,7 +40,7 @@ find_library(XTEST_LIBRARY NAMES Xtst
) )
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(XTest DEFAULT_MSG XTEST_LIBRARY XTEST_INCLUDE_DIR) FIND_PACKAGE_HANDLE_STANDARD_ARGS(XTEST DEFAULT_MSG XTEST_LIBRARY XTEST_INCLUDE_DIR)
if(XTEST_FOUND) if(XTEST_FOUND)
set( XTEST_LIBRARIES ${XTEST_LIBRARY} ) set( XTEST_LIBRARIES ${XTEST_LIBRARY} )