From dec905651161fd7c32496746cfbac9a20fc314d8 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Wed, 3 Feb 2021 19:14:08 +0100 Subject: [PATCH] remove unnecessary cmake_minimum_required from sub projects --- demo/CMakeLists.txt | 2 -- deps/CMakeLists.txt | 1 - deps/agg/CMakeLists.txt | 1 - plugins/CMakeLists.txt | 1 - plugins/input/CMakeLists.txt | 1 - plugins/input/csv/CMakeLists.txt | 3 +-- plugins/input/gdal/CMakeLists.txt | 1 - plugins/input/geobuf/CMakeLists.txt | 3 +-- plugins/input/geojson/CMakeLists.txt | 1 - plugins/input/ogr/CMakeLists.txt | 1 - plugins/input/pgraster/CMakeLists.txt | 1 - plugins/input/postgis/CMakeLists.txt | 1 - plugins/input/raster/CMakeLists.txt | 1 - plugins/input/shape/CMakeLists.txt | 1 - plugins/input/sqlite/CMakeLists.txt | 1 - plugins/input/topojson/CMakeLists.txt | 1 - src/CMakeLists.txt | 3 --- src/json/CMakeLists.txt | 2 -- src/wkt/CMakeLists.txt | 3 --- utils/CMakeLists.txt | 1 - 20 files changed, 2 insertions(+), 28 deletions(-) diff --git a/demo/CMakeLists.txt b/demo/CMakeLists.txt index 1bc4c8ddd..f69a8f697 100644 --- a/demo/CMakeLists.txt +++ b/demo/CMakeLists.txt @@ -1,5 +1,3 @@ -cmake_minimum_required(VERSION 3.15.0) - if(BUILD_DEMO_VIEWER) message(STATUS "Building demo viewer") add_subdirectory(viewer) diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt index e96f65584..603a29b69 100644 --- a/deps/CMakeLists.txt +++ b/deps/CMakeLists.txt @@ -1,2 +1 @@ -cmake_minimum_required(VERSION 3.15.0) add_subdirectory(agg) diff --git a/deps/agg/CMakeLists.txt b/deps/agg/CMakeLists.txt index ef505cdfa..f54669c49 100644 --- a/deps/agg/CMakeLists.txt +++ b/deps/agg/CMakeLists.txt @@ -1,4 +1,3 @@ -cmake_minimum_required(VERSION 3.15.0) project(agg) add_library(agg INTERFACE) diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index f53de93d3..76cc4ef34 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -1,2 +1 @@ -cmake_minimum_required(VERSION 3.15.0) add_subdirectory(input) diff --git a/plugins/input/CMakeLists.txt b/plugins/input/CMakeLists.txt index 78250545b..d289c2a3e 100644 --- a/plugins/input/CMakeLists.txt +++ b/plugins/input/CMakeLists.txt @@ -1,4 +1,3 @@ -cmake_minimum_required(VERSION 3.15.0) if(USE_PLUGIN_INPUT_CSV) message(STATUS "using input plugin csv") add_subdirectory(csv) diff --git a/plugins/input/csv/CMakeLists.txt b/plugins/input/csv/CMakeLists.txt index bef173f84..1c04d128b 100644 --- a/plugins/input/csv/CMakeLists.txt +++ b/plugins/input/csv/CMakeLists.txt @@ -1,4 +1,3 @@ -cmake_minimum_required(VERSION 3.15.0) project(input-csv) add_library(input-csv SHARED @@ -23,4 +22,4 @@ set_target_properties(input-csv PROPERTIES SUFFIX ".input") install(TARGETS input-csv RUNTIME DESTINATION ${PLUGINS_INSTALL_DIR} -) \ No newline at end of file +) diff --git a/plugins/input/gdal/CMakeLists.txt b/plugins/input/gdal/CMakeLists.txt index 366b3f920..5c47cbb58 100644 --- a/plugins/input/gdal/CMakeLists.txt +++ b/plugins/input/gdal/CMakeLists.txt @@ -1,4 +1,3 @@ -cmake_minimum_required(VERSION 3.15.0) project(input-gdal) find_package(GDAL REQUIRED) diff --git a/plugins/input/geobuf/CMakeLists.txt b/plugins/input/geobuf/CMakeLists.txt index 3e36629ea..77c7ff743 100644 --- a/plugins/input/geobuf/CMakeLists.txt +++ b/plugins/input/geobuf/CMakeLists.txt @@ -1,4 +1,3 @@ -cmake_minimum_required(VERSION 3.15.0) project(input-geobuf) add_library(input-geobuf SHARED @@ -17,4 +16,4 @@ set_target_properties(input-geobuf PROPERTIES SUFFIX ".input") install(TARGETS input-geobuf RUNTIME DESTINATION ${PLUGINS_INSTALL_DIR} -) \ No newline at end of file +) diff --git a/plugins/input/geojson/CMakeLists.txt b/plugins/input/geojson/CMakeLists.txt index 26a0821a2..6d2c184f9 100644 --- a/plugins/input/geojson/CMakeLists.txt +++ b/plugins/input/geojson/CMakeLists.txt @@ -1,4 +1,3 @@ -cmake_minimum_required(VERSION 3.15.0) project(input-geojson) add_library(input-geojson SHARED diff --git a/plugins/input/ogr/CMakeLists.txt b/plugins/input/ogr/CMakeLists.txt index c01c6bb5f..d03ac7329 100644 --- a/plugins/input/ogr/CMakeLists.txt +++ b/plugins/input/ogr/CMakeLists.txt @@ -1,4 +1,3 @@ -cmake_minimum_required(VERSION 3.15.0) project(input-ogr) find_package(GDAL REQUIRED) diff --git a/plugins/input/pgraster/CMakeLists.txt b/plugins/input/pgraster/CMakeLists.txt index a6166128d..3d837eb4f 100644 --- a/plugins/input/pgraster/CMakeLists.txt +++ b/plugins/input/pgraster/CMakeLists.txt @@ -1,4 +1,3 @@ -cmake_minimum_required(VERSION 3.15.0) project(input-pgraster) find_package(PostgreSQL REQUIRED) diff --git a/plugins/input/postgis/CMakeLists.txt b/plugins/input/postgis/CMakeLists.txt index ba3192a98..f07a45458 100644 --- a/plugins/input/postgis/CMakeLists.txt +++ b/plugins/input/postgis/CMakeLists.txt @@ -1,4 +1,3 @@ -cmake_minimum_required(VERSION 3.15.0) project(input-postgis) find_package(PostgreSQL REQUIRED) diff --git a/plugins/input/raster/CMakeLists.txt b/plugins/input/raster/CMakeLists.txt index 2aed0fdc0..50586425c 100644 --- a/plugins/input/raster/CMakeLists.txt +++ b/plugins/input/raster/CMakeLists.txt @@ -1,4 +1,3 @@ -cmake_minimum_required(VERSION 3.15.0) project(input-raster) add_library(input-raster SHARED diff --git a/plugins/input/shape/CMakeLists.txt b/plugins/input/shape/CMakeLists.txt index 6753eb9de..8f90aff12 100644 --- a/plugins/input/shape/CMakeLists.txt +++ b/plugins/input/shape/CMakeLists.txt @@ -1,4 +1,3 @@ -cmake_minimum_required(VERSION 3.15.0) project(input-shape) add_library(input-shape SHARED diff --git a/plugins/input/sqlite/CMakeLists.txt b/plugins/input/sqlite/CMakeLists.txt index 439d19dfb..4bbd0fc98 100644 --- a/plugins/input/sqlite/CMakeLists.txt +++ b/plugins/input/sqlite/CMakeLists.txt @@ -1,4 +1,3 @@ -cmake_minimum_required(VERSION 3.15.0) project(input-sqlite) find_package(SQLite3 REQUIRED) diff --git a/plugins/input/topojson/CMakeLists.txt b/plugins/input/topojson/CMakeLists.txt index 6b3ffb16f..78799a5d1 100644 --- a/plugins/input/topojson/CMakeLists.txt +++ b/plugins/input/topojson/CMakeLists.txt @@ -1,4 +1,3 @@ -cmake_minimum_required(VERSION 3.15.0) project(input-topojson) add_library(input-topojson SHARED diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2ff07f3fc..e98bc2c3b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,6 +1,3 @@ -cmake_minimum_required(VERSION 3.15.0) - - add_subdirectory(json) add_subdirectory(wkt) diff --git a/src/json/CMakeLists.txt b/src/json/CMakeLists.txt index a8430a2f7..b00651904 100644 --- a/src/json/CMakeLists.txt +++ b/src/json/CMakeLists.txt @@ -1,5 +1,3 @@ -cmake_minimum_required(VERSION 3.15.0) - add_library(json STATIC extract_bounding_boxes_x3.cpp feature_from_geojson.cpp diff --git a/src/wkt/CMakeLists.txt b/src/wkt/CMakeLists.txt index 1741834c2..2e3fc5fb9 100644 --- a/src/wkt/CMakeLists.txt +++ b/src/wkt/CMakeLists.txt @@ -1,6 +1,3 @@ -cmake_minimum_required(VERSION 3.15.0) - - add_library(wkt STATIC geometry_to_wkt.cpp mapnik_wkt_generator_grammar.cpp diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt index 9a95c5713..7aca5c8e4 100644 --- a/utils/CMakeLists.txt +++ b/utils/CMakeLists.txt @@ -1,4 +1,3 @@ -cmake_minimum_required(VERSION 3.15.0) if(BUILD_UTILITY_GEOMETRY_TO_WKB) message(STATUS "building utility geometry_to_wkb") add_subdirectory(geometry_to_wkb)