aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt4
-rw-r--r--tests/CMakeLists.txt9
2 files changed, 8 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index df0759f1..a92d621f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,8 +1,6 @@
cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
-# We need to set a language to find CMake packages installed in
-# architecture-dependent locations (like /usr/lib64)
-project(extra-cmake-modules C)
+project(extra-cmake-modules NONE)
set(ECM_MAJOR_VERSION 0)
set(ECM_MINOR_VERSION 0)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index dfcc252a..65de038e 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,9 +1,14 @@
-# a macro for tests that have a simple format where the name matches the
-# directory and project
+# We need to set a language to find CMake packages installed in
+# architecture-dependent locations (like /usr/lib64).
+# We only set this for the tests, making sure it does not interfere
+# with other files (as ECM itself is architecture-independent).
+project(ECMTests C)
add_subdirectory(ECMGenerateHeadersTest)
add_subdirectory(ECMSetupVersionTest)
+# a macro for tests that have a simple format where the name matches the
+# directory and project
macro(ADD_TEST_MACRO NAME COMMAND)
string(REPLACE "." "/" dir "${NAME}")
string(REGEX REPLACE "[^.]*\\." "" proj "${NAME}")