diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt --- a/src/plugins/CMakeLists.txt +++ b/src/plugins/CMakeLists.txt @@ -19,11 +19,10 @@ PATTERN Messages.sh EXCLUDE) endfunction() -set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH}) -include(QMLModules) -find_qmlmodule(Ubuntu.OnlineAccounts 0.1) -find_qmlmodule(org.kde.kdeconnect 1.0) -find_qmlmodule(org.kde.kquickcontrolsaddons 2.0) +include(ECMQMLModules) +ecm_find_qmlmodule(Ubuntu.OnlineAccounts 0.1) +ecm_find_qmlmodule(org.kde.kdeconnect 1.0) +ecm_find_qmlmodule(org.kde.kquickcontrolsaddons 2.0) find_package(KAccounts) find_package(KF5KIO ${KF5_DEP_VERSION} REQUIRED) diff --git a/src/plugins/cmake/FindQMLModule.cmake.in b/src/plugins/cmake/FindQMLModule.cmake.in deleted file mode 100644 --- a/src/plugins/cmake/FindQMLModule.cmake.in +++ /dev/null @@ -1,50 +0,0 @@ -#============================================================================= -# Copyright 2015 Aleix Pol Gonzalez -# -# 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(ECMFindModuleHelpersStub) - -execute_process(COMMAND qmlplugindump "@MODULE_NAME@" "@VERSION@" ERROR_VARIABLE ERRORS_OUTPUT OUTPUT_VARIABLE DISREGARD_VARIABLE RESULT_VARIABLE ExitCode) - -if(ExitCode EQUAL 0) - set(@GENMODULE@_FOUND TRUE) - set(@GENMODULE@_VERSION "${PACKAGE_FIND_VERSION}") -else() - message(STATUS "qmlplugindump failed for @MODULE_NAME@.") - set(@GENMODULE@_FOUND FALSE) -endif() - -find_package_handle_standard_args(@GENMODULE@ - FOUND_VAR - @GENMODULE@_FOUND - REQUIRED_VARS - @GENMODULE@_FOUND - VERSION_VAR - @GENMODULE@_VERSION - HANDLE_COMPONENTS -) - - diff --git a/src/plugins/cmake/QMLModules.cmake b/src/plugins/cmake/QMLModules.cmake deleted file mode 100644 --- a/src/plugins/cmake/QMLModules.cmake +++ /dev/null @@ -1,47 +0,0 @@ -#.rst: -# FindQMLModule -# ------- -# -# Find QML modules through a find_qmlmodule() call. -# -#============================================================================= -# Copyright 2015 Aleix Pol Gonzalez -# -# 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. -#============================================================================= - -set(MODULES_DIR ${CMAKE_CURRENT_LIST_DIR}) - -function(find_qmlmodule MODULE_NAME VERSION) - set(GENMODULE "${MODULE_NAME}-QMLModule") - - configure_file("${MODULES_DIR}/FindQMLModule.cmake.in" "Find${GENMODULE}.cmake" @ONLY) - - set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_BINARY_DIR}" ${CMAKE_MODULE_PATH}) - find_package(${GENMODULE} ${ARGN}) - - set_package_properties(${GENMODULE} PROPERTIES - DESCRIPTION "${MODULE_NAME} is a runtime dependency" - TYPE RUNTIME) -endfunction()