From 166c215fc8016f6359f63d749cb3ff06f612692c Mon Sep 17 00:00:00 2001 From: Conlan Cesar Date: Mon, 5 Aug 2019 10:28:33 -0400 Subject: Fix tests still running despite being disabled This fix was included in release 6.0, simple backport to 5.2. --- CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b100e62f..98b2c533 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -164,5 +164,6 @@ add_subdirectory(nad) add_subdirectory(src) add_subdirectory(man) add_subdirectory(cmake) -add_subdirectory(test) - +if(PROJ_TESTS) + add_subdirectory(test) +endif(PROJ_TESTS) -- cgit v1.2.3 From f849dc37f106ccd9a7a60c2aa04e73e0794b5a39 Mon Sep 17 00:00:00 2001 From: Conlan Cesar Date: Tue, 6 Aug 2019 09:13:47 -0400 Subject: Remove the "LANGUAGES" CMake 3 keyword `LANGUAGES` in this context was first introduced as a CMake 3 feature, but we advertise 2.6 support. Removing the keyword restores compatibility. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 98b2c533..7f61e21a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,7 +12,7 @@ cmake_minimum_required(VERSION 2.6.0 FATAL_ERROR) # For historic reasons, the CMake PROJECT-NAME is PROJ4 -project(PROJ4 LANGUAGES C CXX) +project(PROJ4 C CXX) set(PROJECT_INTERN_NAME PROJ) if (NOT CMAKE_VERSION VERSION_LESS 3.1) -- cgit v1.2.3