diff options
| author | Arjen Hiemstra <ahiemstra@heimr.nl> | 2021-08-02 14:56:56 +0200 |
|---|---|---|
| committer | Arjen Hiemstra <ahiemstra@heimr.nl> | 2022-01-18 12:09:57 +0000 |
| commit | 6fefacf8c4efe8b35aa543514892cbf38cf7b4d9 (patch) | |
| tree | d5ce029678fc557f35365581fd51e4e5f4d85d03 /tests | |
| parent | 3813fd1bc97fa6bb2189cc9586f77be4c30478d6 (diff) | |
| download | extra-cmake-modules-6fefacf8c4efe8b35aa543514892cbf38cf7b4d9.tar.gz extra-cmake-modules-6fefacf8c4efe8b35aa543514892cbf38cf7b4d9.tar.bz2 | |
Rename ECMQMLModules.cmake to ECMFindQmlModule.cmake
To avoid ambiguity with ECMQmlModule.cmake.
To preserve backward compatibility, we keep a version around of
ECMQMLModules.cmake that warns a user of it being moved and includes the
new file.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/ECMFindQmlModule/CMakeLists.txt (renamed from tests/ECMQMLModules/CMakeLists.txt) | 2 | ||||
| -rw-r--r-- | tests/ECMFindQmlModule/main.c (renamed from tests/ECMQMLModules/main.c) | 0 |
3 files changed, 2 insertions, 2 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 7ffcfd03..24b4cd40 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -208,7 +208,7 @@ set_package_properties( PURPOSE "Required to run tests for the ECMQMLModules module." ) if (TARGET Qt5::Quick) - add_test_macro(ECMQMLModules dummy) + add_test_macro(ECMFindQmlModule dummy) set(ECMQmlModuleTest.static_full_EXTRA_OPTIONS --build-target install diff --git a/tests/ECMQMLModules/CMakeLists.txt b/tests/ECMFindQmlModule/CMakeLists.txt index 240352e2..c91d0385 100644 --- a/tests/ECMQMLModules/CMakeLists.txt +++ b/tests/ECMFindQmlModule/CMakeLists.txt @@ -5,7 +5,7 @@ set(ECM_FIND_MODULE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../find-modules) set(ECM_MODULE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../modules) set(CMAKE_MODULE_PATH "${ECM_FIND_MODULE_DIR}" "${ECM_MODULE_DIR}") -include(ECMQMLModules) +include(ECMFindQmlModule) ecm_find_qmlmodule(QtQuick 2.1) diff --git a/tests/ECMQMLModules/main.c b/tests/ECMFindQmlModule/main.c index c13815ce..c13815ce 100644 --- a/tests/ECMQMLModules/main.c +++ b/tests/ECMFindQmlModule/main.c |