Merge pull request #1596 from joto/modernize-cmake

Modernize cmake

Author: lonvia

.github/workflows/ci.yml

@@ -179,6 +179,25 @@ jobs:
       - uses: ./.github/actions/ubuntu-prerequisites
       - uses: ./.github/actions/build-and-test
 
+  ubuntu20-pg13-clang10-cpp17:
+    runs-on: ubuntu-20.04
+
+    env:
+      CC: clang-10
+      CXX: clang++-10
+      LUA_VERSION: 5.3
+      LUAJIT_OPTION: OFF
+      POSTGRESQL_VERSION: 14
+      POSTGIS_VERSION: 3
+      CPP_VERSION: 17
+      USE_PROJ_LIB: 6
+      BUILD_TYPE: Debug
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ./.github/actions/ubuntu-prerequisites
+      - uses: ./.github/actions/build-and-test
+
   ubuntu20-pg13-gcc10-release:
     runs-on: ubuntu-20.04
 

CMakeLists.txt

@@ -1,10 +1,7 @@
-set(PACKAGE osm2pgsql)
-set(PACKAGE_NAME osm2pgsql)
-set(PACKAGE_VERSION 1.5.1)
 
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.5.0)
 
-project(osm2pgsql)
+project(osm2pgsql VERSION 1.5.1 LANGUAGES CXX)
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
@@ -34,7 +31,7 @@ if (PROJECT_SOURCE_DIR STREQUAL PROJECT_BINARY_DIR)
     message(FATAL_ERROR "In-source builds are not allowed, please use a separate build directory like `mkdir build && cd build && cmake ..`")
 endif()
 
-message(STATUS "Building osm2pgsql ${PACKAGE_VERSION}")
+message(STATUS "Building osm2pgsql ${PROJECT_VERSION}")
 
 if (NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE RelWithDebInfo)
@@ -48,13 +45,11 @@ set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 if (MSVC)
-    add_definitions(-D_CRT_SECURE_NO_WARNINGS -DNOMINMAX -wd4996)
+    add_definitions(-D_CRT_SECURE_NO_WARNINGS -DNOMINMAX)
+    add_compile_options(-wd4996)
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /ignore:4099 /STACK:30000000")
 else()
-    add_definitions(-Wall)
-    if (CMAKE_VERSION VERSION_LESS 3.1)
-        add_definitions(-std=c++14)
-    endif()
+    add_compile_options(-Wall)
 endif()
 
 option(EXTERNAL_LIBOSMIUM "Do not use the bundled libosmium" OFF)
@@ -71,10 +66,10 @@ if (NOT WIN32 AND NOT APPLE)
     set(PostgreSQL_TYPE_INCLUDE_DIR /usr/include)
 endif()
 
-set(MINIMUM_POSTGRESQL_SERVER_VERSION "9.3")
-set(MINIMUM_POSTGRESQL_SERVER_VERSION_NUM "90300")
+set(MINIMUM_POSTGRESQL_SERVER_VERSION "9.5")
+set(MINIMUM_POSTGRESQL_SERVER_VERSION_NUM "90500")
 
-set(PostgreSQL_ADDITIONAL_VERSIONS "13" "12" "11" "10" "9.6" "9.5" "9.4" "9.3")
+set(PostgreSQL_ADDITIONAL_VERSIONS "14" "13" "12" "11" "10" "9.6" "9.5")
 
 #############################################################
 # Version
@@ -132,7 +127,7 @@ if (BUILD_COVERAGE)
             message(STATUS "  found")
         endif()
 
-        add_definitions(-g -O0 -fno-inline-functions -fno-inline --coverage)
+        add_compile_options(-g -O0 -fno-inline-functions -fno-inline --coverage)
 
         set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --coverage"
             CACHE
@@ -190,7 +185,7 @@ endif()
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR})
 
-find_package(Osmium 2.17.0 REQUIRED COMPONENTS io)
+find_package(Osmium 2.17.2 REQUIRED COMPONENTS io)
 include_directories(SYSTEM ${OSMIUM_INCLUDE_DIRS} ${PROTOZERO_INCLUDE_DIR} ${FMT_INCLUDE_DIR} ${RAPIDJSON_INCLUDE_DIR})
 
 if (WITH_LUA)
@@ -297,7 +292,7 @@ target_link_libraries(osm2pgsql osm2pgsql_lib ${LIBS})
 
 message(STATUS "Looking for clang-tidy")
 find_program(CLANG_TIDY
-             NAMES clang-tidy clang-tidy-12 clang-tidy-11 clang-tidy-10 clang-tidy-9 clang-tidy-8 clang-tidy-7)
+             NAMES clang-tidy clang-tidy-14 clang-tidy-13 clang-tidy-12 clang-tidy-11)
 
 if (CLANG_TIDY)
     message(STATUS "Looking for clang-tidy - found ${CLANG_TIDY}")

CONTRIBUTING.md

@@ -148,7 +148,7 @@ the report.
 ## Releasing a new version
 
 * Decide on a new version. (See [semantic versioning](https://semver.org/).)
-* Update version in [CMakeLists.txt](CMakeLists.txt), look for `PACKAGE_VERSION`.
+* Update version in [CMakeLists.txt](CMakeLists.txt), look for `project` function.
 * Build man page (`make man`) and copy it to `docs/osm2pgsql.1`.
 * Tag release with release notes in commit message and upload the tag to Github.
 * Fill out release notes on Github.

docs/CMakeLists.txt

@@ -9,7 +9,7 @@ if(PANDOC)
         -s
         -t man
         --template ${CMAKE_CURRENT_SOURCE_DIR}/manpage.template
-        --variable "version=${PACKAGE_VERSION}"
+        --variable "version=${PROJECT_VERSION}"
         --variable "title=OSM2PGSQL"
         --variable "section=1"
     )

src/CMakeLists.txt

@@ -1,5 +1,7 @@
 
-set(osm2pgsql_lib_SOURCES
+add_library(osm2pgsql_lib STATIC)
+
+target_sources(osm2pgsql_lib PRIVATE
   db-check.cpp
   db-copy.cpp
   dependency-manager.cpp
@@ -39,7 +41,7 @@ if (LUA_FOUND OR LUAJIT_FOUND)
                  "${CMAKE_CURRENT_SOURCE_DIR}/init.lua")
     file(READ "${CMAKE_CURRENT_SOURCE_DIR}/init.lua" LUA_INIT_CODE)
     configure_file(lua-init.cpp.in lua-init.cpp @ONLY)
-    list(APPEND osm2pgsql_lib_SOURCES
+    target_sources(osm2pgsql_lib PRIVATE
         flex-table.cpp
         flex-table-column.cpp
         geom-transform.cpp
@@ -49,21 +51,20 @@ if (LUA_FOUND OR LUAJIT_FOUND)
         ${CMAKE_CURRENT_BINARY_DIR}/lua-init.cpp)
 endif()
 
-list(APPEND osm2pgsql_lib_SOURCES ${PROJECT_BINARY_DIR}/src/version.cpp)
+target_sources(osm2pgsql_lib PRIVATE ${PROJECT_BINARY_DIR}/src/version.cpp)
 
 if (HAVE_PROJ4)
-    list(APPEND osm2pgsql_lib_SOURCES reprojection-generic-proj4.cpp)
+    target_sources(osm2pgsql_lib PRIVATE reprojection-generic-proj4.cpp)
     if (NOT MSVC)
         set_source_files_properties(reprojection-generic-proj4.cpp
             PROPERTIES COMPILE_FLAGS -Wno-deprecated-declarations)
     endif()
 elseif(HAVE_PROJ6)
-    list(APPEND osm2pgsql_lib_SOURCES reprojection-generic-proj6.cpp)
+    target_sources(osm2pgsql_lib PRIVATE reprojection-generic-proj6.cpp)
 else()
-    list(APPEND osm2pgsql_lib_SOURCES reprojection-generic-none.cpp)
+    target_sources(osm2pgsql_lib PRIVATE reprojection-generic-none.cpp)
 endif()
 
-add_library(osm2pgsql_lib STATIC ${osm2pgsql_lib_SOURCES})
 set_target_properties(osm2pgsql_lib PROPERTIES OUTPUT_NAME osm2pgsql)
 target_link_libraries(osm2pgsql_lib ${LIBS})
 

src/version.cpp.in

@@ -14,12 +14,12 @@ char const *get_build_type() noexcept
 
 char const *get_osm2pgsql_version() noexcept
 {
-    return "@PACKAGE_VERSION@@VERSION_FROM_GIT@";
+    return "@PROJECT_VERSION@@VERSION_FROM_GIT@";
 }
 
 char const *get_osm2pgsql_short_version() noexcept
 {
-    return "@PACKAGE_VERSION@";
+    return "@PROJECT_VERSION@";
 }
 
 char const *get_minimum_postgresql_server_version() noexcept