diff --git a/build/cmake/init.cmake b/build/cmake/init.cmake index 2fdb787484..75bd8f815b 100644 --- a/build/cmake/init.cmake +++ b/build/cmake/init.cmake @@ -317,7 +317,7 @@ if(UNIX) if(wxUSE_SECRETSTORE AND NOT APPLE) # 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. - find_package(Libsecret) + find_package(LIBSECRET) if(NOT LIBSECRET_FOUND) message(WARNING "libsecret not found, wxSecretStore won't be available") wx_option_force_value(wxUSE_SECRETSTORE OFF) @@ -325,7 +325,7 @@ if(UNIX) endif() if(wxUSE_LIBICONV) - find_package(Iconv) + find_package(ICONV) if(NOT ICONV_FOUND) message(WARNING "iconv not found") wx_option_force_value(wxUSE_LIBICONV OFF) @@ -395,13 +395,13 @@ if(wxUSE_GUI) if(wxUSE_WEBVIEW) if(WXGTK) if(wxUSE_WEBVIEW_WEBKIT) - find_package(LibSoup) + find_package(LIBSOUP) if(WXGTK2) - find_package(Webkit 1.0) + find_package(WEBKIT 1.0) elseif(WXGTK3) - find_package(Webkit2) + find_package(WEBKIT2) if(NOT WEBKIT2_FOUND) - find_package(Webkit 3.0) + find_package(WEBKIT 3.0) endif() endif() endif() @@ -429,8 +429,8 @@ if(wxUSE_GUI) endif() if(wxUSE_PRIVATE_FONTS AND WXGTK) - find_package(Fontconfig) - find_package(PangoFT2) + find_package(FONTCONFIG) + find_package(PANGOFT2) if(NOT FONTCONFIG_FOUND OR NOT PANGOFT2_FOUND) message(WARNING "Fontconfig or PangoFT2 not found, Private fonts won't be available") wx_option_force_value(wxUSE_PRIVATE_FONTS OFF) @@ -438,9 +438,9 @@ if(wxUSE_GUI) endif() 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) - find_package(GStreamer 0.10 COMPONENTS interfaces) + find_package(GSTREAMER 0.10 COMPONENTS interfaces) endif() set(wxUSE_GSTREAMER ${GSTREAMER_FOUND}) @@ -472,7 +472,7 @@ if(wxUSE_GUI) endif() if(wxUSE_NOTIFICATION_MESSAGE AND UNIX AND WXGTK2 AND wxUSE_LIBNOTIFY) - find_package(LibNotify) + find_package(LIBNOTIFY) if(NOT LIBNOTIFY_FOUND) message(WARNING "Libnotify not found, it won't be used for notifications") wx_option_force_value(wxUSE_LIBNOTIFY OFF) @@ -485,7 +485,7 @@ if(wxUSE_GUI) if(wxUSE_UIACTIONSIMULATOR AND UNIX AND WXGTK) if(wxUSE_XTEST) - find_package(XTest) + find_package(XTEST) if(XTEST_FOUND) list(APPEND wxTOOLKIT_INCLUDE_DIRS ${XTEST_INCLUDE_DIRS}) list(APPEND wxTOOLKIT_LIBRARIES ${XTEST_LIBRARIES}) @@ -518,7 +518,7 @@ if(wxUSE_GUI) endif() if(WXGTK2 AND wxUSE_MIMETYPE AND wxUSE_LIBGNOMEVFS) - find_package(GnomeVFS2) + find_package(GNOMEVFS2) if(GNOMEVFS2_FOUND) list(APPEND wxTOOLKIT_INCLUDE_DIRS ${GNOMEVFS2_INCLUDE_DIRS}) list(APPEND wxTOOLKIT_LIBRARIES ${GNOMEVFS2_LIBRARIES}) diff --git a/build/cmake/modules/FindFontconfig.cmake b/build/cmake/modules/FindFONTCONFIG.cmake similarity index 100% rename from build/cmake/modules/FindFontconfig.cmake rename to build/cmake/modules/FindFONTCONFIG.cmake diff --git a/build/cmake/modules/FindGnomeVFS2.cmake b/build/cmake/modules/FindGNOMEVFS2.cmake similarity index 95% rename from build/cmake/modules/FindGnomeVFS2.cmake rename to build/cmake/modules/FindGNOMEVFS2.cmake index d942addac3..1dccf3a2bf 100644 --- a/build/cmake/modules/FindGnomeVFS2.cmake +++ b/build/cmake/modules/FindGNOMEVFS2.cmake @@ -74,13 +74,13 @@ else (GNOMEVFS2_LIBRARIES AND GNOMEVFS2_INCLUDE_DIRS) endif (GNOMEVFS2_INCLUDE_DIRS AND GNOMEVFS2_LIBRARIES) if (GNOMEVFS2_FOUND) - if (NOT GnomeVFS2_FIND_QUIETLY) + if (NOT GNOMEVFS2_FIND_QUIETLY) message(STATUS "Found GnomeVFS2: ${GNOMEVFS2_LIBRARIES}") - endif (NOT GnomeVFS2_FIND_QUIETLY) + endif (NOT GNOMEVFS2_FIND_QUIETLY) else (GNOMEVFS2_FOUND) if (GnomeVFS2_FIND_REQUIRED) message(FATAL_ERROR "Could not find GnomeVFS2") - endif (GnomeVFS2_FIND_REQUIRED) + endif (GNOMEVFS2_FIND_REQUIRED) endif (GNOMEVFS2_FOUND) # show the GNOMEVFS2_INCLUDE_DIRS and GNOMEVFS2_LIBRARIES variables only in the advanced view diff --git a/build/cmake/modules/FindGStreamer.cmake b/build/cmake/modules/FindGSTREAMER.cmake similarity index 97% rename from build/cmake/modules/FindGStreamer.cmake rename to build/cmake/modules/FindGSTREAMER.cmake index 8baf9cde7b..c3547ee473 100644 --- a/build/cmake/modules/FindGStreamer.cmake +++ b/build/cmake/modules/FindGSTREAMER.cmake @@ -51,7 +51,7 @@ find_package(PkgConfig) # Determine the version in the library name, default is 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) 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) -foreach (_component ${GStreamer_FIND_COMPONENTS}) +foreach (_component ${GSTREAMER_FIND_COMPONENTS}) set(_gst_component "GSTREAMER_${_component}") string(TOUPPER ${_gst_component} _UPPER_NAME) @@ -128,4 +128,4 @@ foreach (_component ${GStreamer_FIND_COMPONENTS}) endforeach () include(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(GStreamer DEFAULT_MSG ${_GSTREAMER_REQUIRED_VARS}) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(GSTREAMER DEFAULT_MSG ${_GSTREAMER_REQUIRED_VARS}) diff --git a/build/cmake/modules/FindIconv.cmake b/build/cmake/modules/FindICONV.cmake similarity index 96% rename from build/cmake/modules/FindIconv.cmake rename to build/cmake/modules/FindICONV.cmake index 9d95da030b..75825d6332 100644 --- a/build/cmake/modules/FindIconv.cmake +++ b/build/cmake/modules/FindICONV.cmake @@ -49,9 +49,9 @@ IF(ICONV_FOUND) MESSAGE(STATUS "Found Iconv: ${ICONV_LIBRARIES}") ENDIF(NOT ICONV_FIND_QUIETLY) ELSE(ICONV_FOUND) - IF(Iconv_FIND_REQUIRED) + IF(ICONV_FIND_REQUIRED) MESSAGE(FATAL_ERROR "Could not find Iconv") - ENDIF(Iconv_FIND_REQUIRED) + ENDIF(ICONV_FIND_REQUIRED) ENDIF(ICONV_FOUND) MARK_AS_ADVANCED( diff --git a/build/cmake/modules/FindLibNotify.cmake b/build/cmake/modules/FindLIBNOTIFY.cmake similarity index 97% rename from build/cmake/modules/FindLibNotify.cmake rename to build/cmake/modules/FindLIBNOTIFY.cmake index e76b199ba7..12e1949d9a 100644 --- a/build/cmake/modules/FindLibNotify.cmake +++ b/build/cmake/modules/FindLIBNOTIFY.cmake @@ -46,7 +46,7 @@ find_library(LIBNOTIFY_LIBRARIES ) 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) mark_as_advanced( diff --git a/build/cmake/modules/FindLibsecret.cmake b/build/cmake/modules/FindLIBSECRET.cmake similarity index 100% rename from build/cmake/modules/FindLibsecret.cmake rename to build/cmake/modules/FindLIBSECRET.cmake diff --git a/build/cmake/modules/FindLibSoup.cmake b/build/cmake/modules/FindLIBSOUP.cmake similarity index 97% rename from build/cmake/modules/FindLibSoup.cmake rename to build/cmake/modules/FindLIBSOUP.cmake index 8ce25561d8..cbfba1cf93 100644 --- a/build/cmake/modules/FindLibSoup.cmake +++ b/build/cmake/modules/FindLIBSOUP.cmake @@ -50,7 +50,7 @@ if(PC_LIBSOUP_FOUND) endif() 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) mark_as_advanced(LIBSOUP_LIBRARIES LIBSOUP_INCLUDE_DIRS) diff --git a/build/cmake/modules/FindPangoFT2.cmake b/build/cmake/modules/FindPANGOFT2.cmake similarity index 100% rename from build/cmake/modules/FindPangoFT2.cmake rename to build/cmake/modules/FindPANGOFT2.cmake diff --git a/build/cmake/modules/FindWebkit.cmake b/build/cmake/modules/FindWEBKIT.cmake similarity index 93% rename from build/cmake/modules/FindWebkit.cmake rename to build/cmake/modules/FindWEBKIT.cmake index 8b6e6ccef7..1256e89c6d 100644 --- a/build/cmake/modules/FindWebkit.cmake +++ b/build/cmake/modules/FindWEBKIT.cmake @@ -6,8 +6,8 @@ # WEBKIT_FOUND - True if Webkit found. SET(WEBKIT_VERSION 1.0) -if(DEFINED Webkit_FIND_VERSION) - SET(WEBKIT_VERSION ${Webkit_FIND_VERSION}) +if(DEFINED WEBKIT_FIND_VERSION) + SET(WEBKIT_VERSION ${WEBKIT_FIND_VERSION}) endif() SET(WEBKIT_INCLUDE_DIR WEBKIT_INCLUDE_DIR-NOTFOUND) diff --git a/build/cmake/modules/FindWebkit2.cmake b/build/cmake/modules/FindWEBKIT2.cmake similarity index 100% rename from build/cmake/modules/FindWebkit2.cmake rename to build/cmake/modules/FindWEBKIT2.cmake diff --git a/build/cmake/modules/FindXTest.cmake b/build/cmake/modules/FindXTEST.cmake similarity index 96% rename from build/cmake/modules/FindXTest.cmake rename to build/cmake/modules/FindXTEST.cmake index 8fb21f682e..4058b8adb0 100644 --- a/build/cmake/modules/FindXTest.cmake +++ b/build/cmake/modules/FindXTEST.cmake @@ -40,7 +40,7 @@ find_library(XTEST_LIBRARY NAMES Xtst ) 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) set( XTEST_LIBRARIES ${XTEST_LIBRARY} )