Skip to content

Build with C++23 #68

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

Open
brawer wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Build with C++23 #68

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 2 additions & 7 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 3.5)
cmake_minimum_required(VERSION 3.20)
set(CMAKE_C_COMPILER "/usr/bin/clang")
set(CMAKE_CXX_COMPILER "/usr/bin/clang++")
project(OSMExpress)
Expand All @@ -7,6 +7,7 @@ set(CMAKE_CXX_FLAGS_DEBUG "-DDEBUG -g")
set(CMAKE_CXX_FLAGS "-Wno-deprecated")
set(CMAKE_CXX_FLAGS "-Wno-deprecated-declarations")
set(CMAKE_CXX_FLAGS "-pthread")
set(CMAKE_CXX_STANDARD 23)
set(OSMX_VERSION "0.2.0")
set(BUILD_SHARED_LIBS OFF CACHE INTERNAL "")
set(ROARING_BUILD_STATIC ON CACHE INTERNAL "")
Expand Down Expand Up @@ -134,12 +135,8 @@ target_link_libraries(
osmx
bz2 CapnProto::capnp cxxopts::cxxopts expat LMDB::LMDB roaring s2 z)

set_property(TARGET osmx PROPERTY CXX_STANDARD 14)

add_executable(osmxTest test/test_region.cpp src/region.cpp)

set_property(TARGET osmxTest PROPERTY CXX_STANDARD 14)

target_include_directories(
osmxTest
PUBLIC include ${CAPNPC_OUTPUT_DIR}/include)
Expand All @@ -165,8 +162,6 @@ add_library(
src/update.cpp
src/region.cpp)

set_property(TARGET osmx-static PROPERTY CXX_STANDARD 14)

target_include_directories(
osmx-static
PUBLIC include ${CAPNPC_OUTPUT_DIR}/include)
Expand Down