Skip to content

Commit

Permalink
Merge pull request #1045 from DLR-SC/1044_CXX_17_update
Browse files Browse the repository at this point in the history
Update to C++17 standard
  • Loading branch information
svengoldberg authored Dec 18, 2024
2 parents c5ccbb2 + 0d8b557 commit 4adb704
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ cmake_minimum_required (VERSION 3.11.0)
project (TIGL VERSION 3.4.0)
set(TIGL_VERSION 3.4.0)

# enable C++11 support
set(CMAKE_CXX_STANDARD 11)
# enable C++17 support
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
Expand Down
5 changes: 5 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@ Changelog

Changes since last release
-------------
18/12/2024

- General changes:
- Update the C++ standard to C++17 (#1045).

13/11/2024

- Fixes:
Expand Down
2 changes: 0 additions & 2 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ endforeach()

# object library containing just the compiled sources
add_library(tigl3_objects OBJECT ${TIGL_SRC})
target_compile_features(tigl3_objects PRIVATE cxx_std_11)
set_property(TARGET tigl3_objects PROPERTY POSITION_INDEPENDENT_CODE ON) # needed for shared libraries

target_include_directories(tigl3_objects
Expand Down Expand Up @@ -208,7 +207,6 @@ target_include_directories(tigl3_cpp INTERFACE
)

target_link_libraries(tigl3_cpp INTERFACE ${OpenCASCADE_LIBRARIES} Boost::boost Boost::disable_autolinking)
target_compile_features(tigl3_cpp INTERFACE cxx_std_11)

if (TARGET glog::glog)
target_link_libraries (tigl3_cpp INTERFACE glog::glog)
Expand Down

0 comments on commit 4adb704

Please sign in to comment.