From 6fefacf8c4efe8b35aa543514892cbf38cf7b4d9 Mon Sep 17 00:00:00 2001
From: Arjen Hiemstra <ahiemstra@heimr.nl>
Date: Mon, 2 Aug 2021 14:56:56 +0200
Subject: 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.
---
 tests/CMakeLists.txt                  |  2 +-
 tests/ECMFindQmlModule/CMakeLists.txt | 12 ++++++++++++
 tests/ECMFindQmlModule/main.c         |  4 ++++
 tests/ECMQMLModules/CMakeLists.txt    | 12 ------------
 tests/ECMQMLModules/main.c            |  4 ----
 5 files changed, 17 insertions(+), 17 deletions(-)
 create mode 100644 tests/ECMFindQmlModule/CMakeLists.txt
 create mode 100644 tests/ECMFindQmlModule/main.c
 delete mode 100644 tests/ECMQMLModules/CMakeLists.txt
 delete mode 100644 tests/ECMQMLModules/main.c

(limited to 'tests')

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/ECMFindQmlModule/CMakeLists.txt b/tests/ECMFindQmlModule/CMakeLists.txt
new file mode 100644
index 00000000..c91d0385
--- /dev/null
+++ b/tests/ECMFindQmlModule/CMakeLists.txt
@@ -0,0 +1,12 @@
+project(extra-cmake-modules)
+cmake_minimum_required(VERSION 3.5)
+
+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(ECMFindQmlModule)
+
+ecm_find_qmlmodule(QtQuick 2.1)
+
+add_executable(dummy main.c)
diff --git a/tests/ECMFindQmlModule/main.c b/tests/ECMFindQmlModule/main.c
new file mode 100644
index 00000000..c13815ce
--- /dev/null
+++ b/tests/ECMFindQmlModule/main.c
@@ -0,0 +1,4 @@
+int main()
+{
+   return 0;
+}
diff --git a/tests/ECMQMLModules/CMakeLists.txt b/tests/ECMQMLModules/CMakeLists.txt
deleted file mode 100644
index 240352e2..00000000
--- a/tests/ECMQMLModules/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-project(extra-cmake-modules)
-cmake_minimum_required(VERSION 3.5)
-
-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)
-
-ecm_find_qmlmodule(QtQuick 2.1)
-
-add_executable(dummy main.c)
diff --git a/tests/ECMQMLModules/main.c b/tests/ECMQMLModules/main.c
deleted file mode 100644
index c13815ce..00000000
--- a/tests/ECMQMLModules/main.c
+++ /dev/null
@@ -1,4 +0,0 @@
-int main()
-{
-   return 0;
-}
-- 
cgit v1.2.1