⚠ This page is served via a proxy. Original site: https://github.com
This service does not collect credentials or authentication data.
Skip to content

Various Cmake updates #2452

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lonvia merged 3 commits into from
Feb 5, 2026
Merged

Various Cmake updates #2452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b3c1ec6
CMake config: Amend list of PostgreSQL versions
joto Feb 5, 2026
dcd5d7e
CMake config: Fix the way boost is looked for
joto Feb 5, 2026
e859679
CMake config: Disable warnings triggered by Osmium behaviour in GCC
joto Feb 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,6 @@ jobs:
env:
CC: gcc-12
CXX: g++-12
EXTRA_FLAGS: -Wno-stringop-overread
LUA_VERSION: 5.3
LUAJIT_OPTION: ON
POSTGRESQL_VERSION: 13
Expand Down Expand Up @@ -262,7 +261,6 @@ jobs:
env:
CC: gcc-12
CXX: g++-12
EXTRA_FLAGS: -Wno-stringop-overread
LUA_VERSION: 5.4
LUAJIT_OPTION: ON
POSTGRESQL_VERSION: 16
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-install.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
POSTGRESQL_VERSION: 16
POSTGIS_VERSION: 3
BUILD_TYPE: Release
CXXFLAGS: -pedantic -Wextra -Wno-stringop-overread -Werror
CXXFLAGS: -pedantic -Wextra -Werror
PREFIX: /usr/local
OSMURL: https://download.geofabrik.de/europe/monaco-latest.osm.pbf
OSMFILE: monaco-latest.osm.pbf
Expand Down
8 changes: 6 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,10 @@ else()
add_compile_options(-Wall)
endif()

if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
add_definitions(-Wno-stringop-overread -Wno-maybe-uninitialized)
endif()

option(EXTERNAL_LIBOSMIUM "Do not use the bundled libosmium" OFF)
option(EXTERNAL_PROTOZERO "Do not use the bundled protozero" OFF)
option(EXTERNAL_FMT "Do not use the bundled fmt" OFF)
Expand All @@ -67,7 +71,7 @@ endif()
set(MINIMUM_POSTGRESQL_SERVER_VERSION "11")
set(MINIMUM_POSTGRESQL_SERVER_VERSION_NUM "110000")

set(PostgreSQL_ADDITIONAL_VERSIONS "17" "16" "15" "14" "13" "12" "11")
set(PostgreSQL_ADDITIONAL_VERSIONS "19" "18" "17" "16" "15" "14" "13" "12" "11")

#############################################################
# Version
Expand Down Expand Up @@ -196,7 +200,7 @@ endif()

find_program(LUA_EXE NAMES lua lua5.4 lua5.3 lua5.2 lua5.1)

find_package(Boost 1.50 REQUIRED)
find_package(Boost CONFIG 1.50 REQUIRED)
include_directories(SYSTEM ${Boost_INCLUDE_DIR})

find_package(PostgreSQL REQUIRED)
Expand Down