From 83b4989bd4a53973ac136596a859984e76a63436 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Wed, 13 Oct 2021 09:04:26 +0200 Subject: [PATCH] [CMake] restore compability with 3.15 --- demo/CMakeLists.txt | 2 -- test/CMakeLists.txt | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/demo/CMakeLists.txt b/demo/CMakeLists.txt index f69a8f697..c26ddf699 100644 --- a/demo/CMakeLists.txt +++ b/demo/CMakeLists.txt @@ -1,9 +1,7 @@ if(BUILD_DEMO_VIEWER) - message(STATUS "Building demo viewer") add_subdirectory(viewer) endif() if(BUILD_DEMO_CPP) - message(STATUS "Building c++ demo app") add_subdirectory(c++) endif() diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 340e52480..4f3f5ff1b 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -109,8 +109,8 @@ target_link_libraries(mapnik-test-unit PUBLIC PostgreSQL::PostgreSQL ) # workaround since the "offical" include dir would be -file(COPY_FILE catch_ext.hpp "${CMAKE_CURRENT_BINARY_DIR}/catch_ext.hpp") -file(COPY_FILE cleanup.hpp "${CMAKE_CURRENT_BINARY_DIR}/cleanup.hpp") +file(COPY catch_ext.hpp DESTINATION "${CMAKE_CURRENT_BINARY_DIR}") +file(COPY cleanup.hpp DESTINATION "${CMAKE_CURRENT_BINARY_DIR}") target_include_directories(mapnik-test-unit PRIVATE "${catch2_SOURCE_DIR}/single_include/catch2" ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) add_executable(agg_rasterizer_integer_overflow_test standalone/agg_rasterizer_integer_overflow_test.cpp)