From cf5ccc7d9eba368846fae043855d9b064dac786d Mon Sep 17 00:00:00 2001 From: Alex Merry Date: Sun, 18 Jan 2015 22:25:26 +0000 Subject: Add ecm_add_app_icon function. This adds an application icon to an executable from PNG files for Windows and Mac OS X. Unlike the similar kde4_add_app_icon macro from kdelibs, this requires icons to be explicitly listed as arguments (meaning CMake can tell when ones are added or deleted and reconfigure as appropriate), and it works with Matthias Benkmann's png2ico tool, as well as the KDE-Win tool of the same name. Currently missing unit tests. Also completely untested (except that `make test` runs on Linux, so there are no obvious syntax errors). With thanks to Ralf Habacker for the inital work on porting kde4_add_app_icon. CHANGELOG: Add ECMAddAppIcon module to add icons to executable targets on Windows and Mac OS X. --- find-modules/FindPng2Ico.cmake | 115 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) create mode 100644 find-modules/FindPng2Ico.cmake (limited to 'find-modules') diff --git a/find-modules/FindPng2Ico.cmake b/find-modules/FindPng2Ico.cmake new file mode 100644 index 00000000..71e2487c --- /dev/null +++ b/find-modules/FindPng2Ico.cmake @@ -0,0 +1,115 @@ +#.rst: +# FindPng2Ico +# ----------- +# +# Try to find png2ico. +# +# If the png2ico executable is not in your PATH, you can provide +# an alternative name or full path location with the ``Png2Ico_EXECUTABLE`` +# variable. +# +# This will define the following variables: +# +# ``Png2Ico_FOUND`` +# True if png2ico is available. +# +# ``Png2Ico_EXECUTABLE`` +# The png2ico executable. +# +# If ``Png2Ico_FOUND`` is TRUE, it will also define the following imported +# target: +# +# ``Png2Ico::Png2Ico`` +# The png2ico executable. +# +# and the following variables: +# +# ``Png2Ico_HAS_COLORS_ARGUMENT`` +# Whether png2ico accepts a ``--colors`` argument. `Matthias Benkmann's +# tool `_ does, while the +# version of png2ico from the `"KDE On Windows" (kdewin) +# `_ project does not. +# +# ``Png2Ico_HAS_RCFILE_ARGUMENT`` +# Whether png2ico accepts an ``--rcfile`` argument. The version of png2ico +# from the `"KDE On Windows" (kdewin) +# `_ project does, +# while `Matthias Benkmann's tool +# `_ does not. +# + +#============================================================================= +# Copyright 2014 Alex Merry +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# 3. The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +#============================================================================= + +include(${CMAKE_CURRENT_LIST_DIR}/ECMFindModuleHelpersStub.cmake) + +ecm_find_package_version_check(Png2Ico) + +# Find png2ico +find_program(Png2Ico_EXECUTABLE NAMES png2ico) + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(Png2Ico + FOUND_VAR + Png2Ico_FOUND + REQUIRED_VARS + Png2Ico_EXECUTABLE +) + +mark_as_advanced(Png2Ico_EXECUTABLE) + +if (Png2Ico_FOUND) + execute_process( + COMMAND "${Png2Ico_EXECUTABLE}" --help + OUTPUT_VARIABLE _png2ico_help_text + ) + if (_png2ico_help_text MATCHES ".*--rcfile .*") + set(Png2Ico_HAS_RCFILE_ARGUMENT TRUE) + else() + set(Png2Ico_HAS_RCFILE_ARGUMENT FALSE) + endif() + if (_png2ico_help_text MATCHES ".*--colors .*") + set(Png2Ico_HAS_COLORS_ARGUMENT TRUE) + else() + set(Png2Ico_HAS_COLORS_ARGUMENT FALSE) + endif() + unset(_png2ico_help_text) + + if (NOT TARGET Png2Ico::Png2Ico) + add_executable(Png2Ico::Png2Ico IMPORTED) + set_target_properties(Png2Ico::Png2Ico PROPERTIES + IMPORTED_LOCATION "${Png2Ico_EXECUTABLE}" + ) + endif() +endif() + +include(FeatureSummary) +set_package_properties(Png2Ico PROPERTIES + URL "http://www.winterdrache.de/freeware/png2ico/ or https://projects.kde.org/projects/kdesupport/kdewin" + DESCRIPTION "Executable that converts a collection of PNG files into a Windows icon file" +) + -- cgit v1.2.1 From fea3b11ca01677e60d552ac29091b28946c99f08 Mon Sep 17 00:00:00 2001 From: Alex Merry Date: Sun, 1 Feb 2015 12:02:14 +0000 Subject: Minor documentation syntax fixes. --- find-modules/FindLibGit2.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'find-modules') diff --git a/find-modules/FindLibGit2.cmake b/find-modules/FindLibGit2.cmake index 3bb87c29..fd6f46ca 100644 --- a/find-modules/FindLibGit2.cmake +++ b/find-modules/FindLibGit2.cmake @@ -1,6 +1,6 @@ #.rst: # FindLibGit2 -# ------- +# ----------- # # Try to find libgit2 on a Unix system. # -- cgit v1.2.1 From a1d6d8f7259ade901a87b33edbef8b31bffb5e26 Mon Sep 17 00:00:00 2001 From: Alex Merry Date: Fri, 6 Feb 2015 11:31:19 +0000 Subject: Document when modules were added to ECM. --- find-modules/FindEGL.cmake | 2 ++ find-modules/FindKF5.cmake | 2 ++ find-modules/FindLibGit2.cmake | 2 ++ find-modules/FindOpenEXR.cmake | 2 ++ find-modules/FindPng2Ico.cmake | 1 + find-modules/FindQtWaylandScanner.cmake | 2 ++ find-modules/FindSharedMimeInfo.cmake | 2 ++ find-modules/FindWayland.cmake | 2 ++ find-modules/FindWaylandScanner.cmake | 2 ++ find-modules/FindX11_XCB.cmake | 2 ++ find-modules/FindXCB.cmake | 2 ++ 11 files changed, 21 insertions(+) (limited to 'find-modules') diff --git a/find-modules/FindEGL.cmake b/find-modules/FindEGL.cmake index 99d268df..b96f3b0f 100644 --- a/find-modules/FindEGL.cmake +++ b/find-modules/FindEGL.cmake @@ -29,6 +29,8 @@ # In general we recommend using the imported target, as it is easier to use. # Bear in mind, however, that if the target is in the link interface of an # exported library, it must be made available by the package config file. +# +# Since pre-1.0.0. #============================================================================= # Copyright 2014 Alex Merry diff --git a/find-modules/FindKF5.cmake b/find-modules/FindKF5.cmake index 2e1fca87..30b20948 100644 --- a/find-modules/FindKF5.cmake +++ b/find-modules/FindKF5.cmake @@ -16,6 +16,8 @@ # If all the required components (those given in the COMPONENTS argument, but # not those given in the OPTIONAL_COMPONENTS argument) are found, ``KF5_FOUND`` # will be set to true. Otherwise, it will be set to false. +# +# Since pre-1.0.0. #============================================================================= # Copyright 2014 Alex Merry diff --git a/find-modules/FindLibGit2.cmake b/find-modules/FindLibGit2.cmake index fd6f46ca..22fc5ebb 100644 --- a/find-modules/FindLibGit2.cmake +++ b/find-modules/FindLibGit2.cmake @@ -28,6 +28,8 @@ # In general we recommend using the imported target, as it is easier to use. # Bear in mind, however, that if the target is in the link interface of an # exported library, it must be made available by the package config file. +# +# Since 1.3.0. #============================================================================= # Copyright 2014 Alex Merry diff --git a/find-modules/FindOpenEXR.cmake b/find-modules/FindOpenEXR.cmake index 85afebdf..b63b8cd0 100644 --- a/find-modules/FindOpenEXR.cmake +++ b/find-modules/FindOpenEXR.cmake @@ -23,6 +23,8 @@ # In general we recommend using the imported target, as it is easier to use. # Bear in mind, however, that if the target is in the link interface of an # exported library, it must be made available by the package config file. +# +# Since pre-1.0.0. #============================================================================= # Copyright 2013-2014 Alex Merry diff --git a/find-modules/FindPng2Ico.cmake b/find-modules/FindPng2Ico.cmake index 71e2487c..7b201988 100644 --- a/find-modules/FindPng2Ico.cmake +++ b/find-modules/FindPng2Ico.cmake @@ -37,6 +37,7 @@ # while `Matthias Benkmann's tool # `_ does not. # +# Since 1.7.0. #============================================================================= # Copyright 2014 Alex Merry diff --git a/find-modules/FindQtWaylandScanner.cmake b/find-modules/FindQtWaylandScanner.cmake index 7fb8a009..28a4fda5 100644 --- a/find-modules/FindQtWaylandScanner.cmake +++ b/find-modules/FindQtWaylandScanner.cmake @@ -55,6 +55,8 @@ # names don't start with ``qt_`` or ``wl_``. # # WaylandScanner is required and will be searched for. +# +# Since 1.4.0. #============================================================================= # Copyright 2012-2014 Pier Luigi Fiorini diff --git a/find-modules/FindSharedMimeInfo.cmake b/find-modules/FindSharedMimeInfo.cmake index 263a5028..ebbe3284 100644 --- a/find-modules/FindSharedMimeInfo.cmake +++ b/find-modules/FindSharedMimeInfo.cmake @@ -23,6 +23,8 @@ # Updates the XDG mime database at install time (unless the ``$DESTDIR`` # environment variable is set, in which case it is up to package managers to # perform this task). +# +# Since pre-1.0.0. #============================================================================= # Copyright 2013-2014 Alex Merry diff --git a/find-modules/FindWayland.cmake b/find-modules/FindWayland.cmake index 490ab1be..f69fa18b 100644 --- a/find-modules/FindWayland.cmake +++ b/find-modules/FindWayland.cmake @@ -44,6 +44,8 @@ # and provide more control. Bear in mind, however, that if any target is in the # link interface of an exported library, it must be made available by the # package config file. +# +# Since pre-1.0.0. #============================================================================= # Copyright 2014 Alex Merry diff --git a/find-modules/FindWaylandScanner.cmake b/find-modules/FindWaylandScanner.cmake index 33c46f9b..4052cdab 100644 --- a/find-modules/FindWaylandScanner.cmake +++ b/find-modules/FindWaylandScanner.cmake @@ -47,6 +47,8 @@ # Generate Wayland server protocol files from ```` XML # definition for the ```` interface and append those files # to ````. +# +# Since 1.4.0. #============================================================================= # Copyright 2012-2014 Pier Luigi Fiorini diff --git a/find-modules/FindX11_XCB.cmake b/find-modules/FindX11_XCB.cmake index eafa08e2..8b975e6a 100644 --- a/find-modules/FindX11_XCB.cmake +++ b/find-modules/FindX11_XCB.cmake @@ -30,6 +30,8 @@ # In general we recommend using the imported target, as it is easier to use. # Bear in mind, however, that if the target is in the link interface of an # exported library, it must be made available by the package config file. +# +# Since pre-1.0.0. #============================================================================= # Copyright 2014 Alex Merry diff --git a/find-modules/FindXCB.cmake b/find-modules/FindXCB.cmake index 781b15c5..b2a800f7 100644 --- a/find-modules/FindXCB.cmake +++ b/find-modules/FindXCB.cmake @@ -51,6 +51,8 @@ # and provide more control. Bear in mind, however, that if any target is in the # link interface of an exported library, it must be made available by the # package config file. +# +# Since pre-1.0.0. #============================================================================= # Copyright 2011 Fredrik Höglund -- cgit v1.2.1 From 7c20867987d21fe36255e8b84fc0dd3003c88e14 Mon Sep 17 00:00:00 2001 From: Jonathan Riddell Date: Wed, 11 Feb 2015 15:07:50 +0100 Subject: Add Debian path to search path for qtwaylandscanner Debian likes to install qt binaries into an obscure path, search here as well REVIEW: 122526 --- find-modules/FindQtWaylandScanner.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'find-modules') diff --git a/find-modules/FindQtWaylandScanner.cmake b/find-modules/FindQtWaylandScanner.cmake index 28a4fda5..79a1b051 100644 --- a/find-modules/FindQtWaylandScanner.cmake +++ b/find-modules/FindQtWaylandScanner.cmake @@ -90,7 +90,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/ECMFindModuleHelpersStub.cmake) ecm_find_package_version_check(QtWaylandScanner) # Find qtwaylandscanner -find_program(QtWaylandScanner_EXECUTABLE NAMES qtwaylandscanner) +find_program(QtWaylandScanner_EXECUTABLE NAMES qtwaylandscanner HINTS /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/qt5/bin/) include(FindPackageHandleStandardArgs) find_package_handle_standard_args(QtWaylandScanner -- cgit v1.2.1 From 4f81d1a92e4ccc2ce7b33d2860397a526b1a4d2f Mon Sep 17 00:00:00 2001 From: Alex Merry Date: Mon, 9 Mar 2015 18:18:16 +0000 Subject: Fix tab characters in regexes. There is no "\t" in CMake's regular expression syntax; we need to make the character be interpreted when CMake parses it as a string. --- find-modules/FindEGL.cmake | 4 ++-- find-modules/FindWayland.cmake | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'find-modules') diff --git a/find-modules/FindEGL.cmake b/find-modules/FindEGL.cmake index b96f3b0f..72474371 100644 --- a/find-modules/FindEGL.cmake +++ b/find-modules/FindEGL.cmake @@ -98,14 +98,14 @@ if(EGL_INCLUDE_DIR) # finding all these defines and selecting the highest numbered. file(READ "${EGL_INCLUDE_DIR}/egl.h" _EGL_header_contents) string(REGEX MATCHALL - "[ \\t]EGL_VERSION_[0-9_]+" + "[ \t]EGL_VERSION_[0-9_]+" _EGL_version_lines "${_EGL_header_contents}" ) unset(_EGL_header_contents) foreach(_EGL_version_line ${_EGL_version_lines}) string(REGEX REPLACE - "[ \\t]EGL_VERSION_([0-9_]+)" + "[ \t]EGL_VERSION_([0-9_]+)" "\\1" _version_candidate "${_EGL_version_line}" diff --git a/find-modules/FindWayland.cmake b/find-modules/FindWayland.cmake index f69fa18b..c5a56c16 100644 --- a/find-modules/FindWayland.cmake +++ b/find-modules/FindWayland.cmake @@ -117,7 +117,7 @@ if(NOT Wayland_VERSION) if(Wayland_VERSION_HEADER) file(READ ${Wayland_VERSION_HEADER} _wayland_version_header_contents) string(REGEX REPLACE - "^.*[ \\t]+WAYLAND_VERSION[ \\t]+\"([0-9.]*)\".*$" + "^.*[ \t]+WAYLAND_VERSION[ \t]+\"([0-9.]*)\".*$" "\\1" Wayland_VERSION "${_wayland_version_header_contents}" -- cgit v1.2.1 From 9521e67d6ac24ac52b05f47f384c048999d7df5f Mon Sep 17 00:00:00 2001 From: Patrick von Reth Date: Sun, 19 Apr 2015 15:01:40 +0200 Subject: execute png2icon --help with ERROR_QUIET, to prevent printing of banner from http://www.winterdrache.de/freeware/png2ico/ --- find-modules/FindPng2Ico.cmake | 1 + 1 file changed, 1 insertion(+) (limited to 'find-modules') diff --git a/find-modules/FindPng2Ico.cmake b/find-modules/FindPng2Ico.cmake index 7b201988..941e9155 100644 --- a/find-modules/FindPng2Ico.cmake +++ b/find-modules/FindPng2Ico.cmake @@ -87,6 +87,7 @@ if (Png2Ico_FOUND) execute_process( COMMAND "${Png2Ico_EXECUTABLE}" --help OUTPUT_VARIABLE _png2ico_help_text + ERROR_QUIET ) if (_png2ico_help_text MATCHES ".*--rcfile .*") set(Png2Ico_HAS_RCFILE_ARGUMENT TRUE) -- cgit v1.2.1 From 8527961d1664b03e563381529f6ae4da83d26550 Mon Sep 17 00:00:00 2001 From: Patrick von Reth Date: Sun, 19 Apr 2015 15:13:32 +0200 Subject: real fix for png2ico, pipe error stream also to result variable --- find-modules/FindPng2Ico.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'find-modules') diff --git a/find-modules/FindPng2Ico.cmake b/find-modules/FindPng2Ico.cmake index 941e9155..d84f6673 100644 --- a/find-modules/FindPng2Ico.cmake +++ b/find-modules/FindPng2Ico.cmake @@ -87,7 +87,7 @@ if (Png2Ico_FOUND) execute_process( COMMAND "${Png2Ico_EXECUTABLE}" --help OUTPUT_VARIABLE _png2ico_help_text - ERROR_QUIET + ERROR_VARIABLE _png2ico_help_text ) if (_png2ico_help_text MATCHES ".*--rcfile .*") set(Png2Ico_HAS_RCFILE_ARGUMENT TRUE) -- cgit v1.2.1 From 37aa23a96e37fa584a68858aef4b4637078e4779 Mon Sep 17 00:00:00 2001 From: Michael Palimaka Date: Thu, 23 Apr 2015 04:17:30 +1000 Subject: Port remaining find modules to ecm_find_package_version_check. REVIEW: 123470 --- find-modules/FindEGL.cmake | 9 +++------ find-modules/FindKF5.cmake | 9 +++------ find-modules/FindLibGit2.cmake | 9 +++------ find-modules/FindOpenEXR.cmake | 5 ++--- find-modules/FindSharedMimeInfo.cmake | 9 +++------ find-modules/FindX11_XCB.cmake | 9 +++------ 6 files changed, 17 insertions(+), 33 deletions(-) (limited to 'find-modules') diff --git a/find-modules/FindEGL.cmake b/find-modules/FindEGL.cmake index 72474371..b8787d8b 100644 --- a/find-modules/FindEGL.cmake +++ b/find-modules/FindEGL.cmake @@ -60,12 +60,9 @@ # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #============================================================================= -if(CMAKE_VERSION VERSION_LESS 2.8.12) - message(FATAL_ERROR "CMake 2.8.12 is required by FindEGL.cmake") -endif() -if(CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 2.8.12) - message(AUTHOR_WARNING "Your project should require at least CMake 2.8.12 to use FindEGL.cmake") -endif() +include(${CMAKE_CURRENT_LIST_DIR}/ECMFindModuleHelpersStub.cmake) + +ecm_find_package_version_check(EGL) # Use pkg-config to get the directories and then use these values # in the FIND_PATH() and FIND_LIBRARY() calls diff --git a/find-modules/FindKF5.cmake b/find-modules/FindKF5.cmake index 30b20948..b0ba9f6b 100644 --- a/find-modules/FindKF5.cmake +++ b/find-modules/FindKF5.cmake @@ -47,12 +47,9 @@ # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #============================================================================= -if(CMAKE_VERSION VERSION_LESS 2.8.12) - message(FATAL_ERROR "CMake 2.8.12 is required by FindKF5.cmake") -endif() -if(CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 2.8.12) - message(AUTHOR_WARNING "Your project should require at least CMake 2.8.12 to use FindKF5.cmake") -endif() +include(${CMAKE_CURRENT_LIST_DIR}/ECMFindModuleHelpersStub.cmake) + +ecm_find_package_version_check(KF5) if (NOT KF5_FIND_COMPONENTS) set(KF5_NOT_FOUND_MESSAGE "The KF5 package requires at least one component") diff --git a/find-modules/FindLibGit2.cmake b/find-modules/FindLibGit2.cmake index 22fc5ebb..eaf227fc 100644 --- a/find-modules/FindLibGit2.cmake +++ b/find-modules/FindLibGit2.cmake @@ -60,12 +60,9 @@ # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #============================================================================= -if(CMAKE_VERSION VERSION_LESS 2.8.12) - message(FATAL_ERROR "CMake 2.8.12 is required by FindLibGit2.cmake") -endif() -if(CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 2.8.12) - message(AUTHOR_WARNING "Your project should require at least CMake 2.8.12 to use FindLibGit2.cmake") -endif() +include(${CMAKE_CURRENT_LIST_DIR}/ECMFindModuleHelpersStub.cmake) + +ecm_find_package_version_check(LibGit2) # Use pkg-config to get the directories and then use these values # in the FIND_PATH() and FIND_LIBRARY() calls diff --git a/find-modules/FindOpenEXR.cmake b/find-modules/FindOpenEXR.cmake index b63b8cd0..d80caadd 100644 --- a/find-modules/FindOpenEXR.cmake +++ b/find-modules/FindOpenEXR.cmake @@ -54,10 +54,9 @@ # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #============================================================================= +include(${CMAKE_CURRENT_LIST_DIR}/ECMFindModuleHelpersStub.cmake) -if(${CMAKE_VERSION} VERSION_LESS 2.8.12) - message(FATAL_ERROR "CMake 2.8.12 is required by FindOpenEXR.cmake") -endif() +ecm_find_package_version_check(OpenEXR) # use pkg-config to get the directories and then use these values # in the FIND_PATH() and FIND_LIBRARY() calls diff --git a/find-modules/FindSharedMimeInfo.cmake b/find-modules/FindSharedMimeInfo.cmake index ebbe3284..00bebf16 100644 --- a/find-modules/FindSharedMimeInfo.cmake +++ b/find-modules/FindSharedMimeInfo.cmake @@ -54,12 +54,9 @@ # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #============================================================================= -if(CMAKE_VERSION VERSION_LESS 2.8.12) - message(FATAL_ERROR "CMake 2.8.12 is required by FindSharedMimeInfo.cmake") -endif() -if(CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 2.8.12) - message(AUTHOR_WARNING "Your project should require at least CMake 2.8.12 to use FindSharedMimeInfo.cmake") -endif() +include(${CMAKE_CURRENT_LIST_DIR}/ECMFindModuleHelpersStub.cmake) + +ecm_find_package_version_check(SharedMimeInfo) find_program (UPDATE_MIME_DATABASE_EXECUTABLE NAMES update-mime-database) diff --git a/find-modules/FindX11_XCB.cmake b/find-modules/FindX11_XCB.cmake index 8b975e6a..dd55fd7b 100644 --- a/find-modules/FindX11_XCB.cmake +++ b/find-modules/FindX11_XCB.cmake @@ -63,12 +63,9 @@ # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #============================================================================= -if(CMAKE_VERSION VERSION_LESS 2.8.12) - message(FATAL_ERROR "CMake 2.8.12 is required by FindX11_XCB.cmake") -endif() -if(CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 2.8.12) - message(AUTHOR_WARNING "Your project should require at least CMake 2.8.12 to use FindX11_XCB.cmake") -endif() +include(${CMAKE_CURRENT_LIST_DIR}/ECMFindModuleHelpersStub.cmake) + +ecm_find_package_version_check(X11_XCB) # use pkg-config to get the directories and then use these values # in the FIND_PATH() and FIND_LIBRARY() calls -- cgit v1.2.1