Skip to content

Commit

Permalink
Use C++14 in the CMake build (#557)
Browse files Browse the repository at this point in the history
This is required by the newer Boost.geometry versions that the
cctbx conda-forge package has enabled mid-cycle in
conda-forge/cctbx-base-feedstock#58
  • Loading branch information
ndevenish authored Sep 16, 2022
1 parent a853417 commit bdf304b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
include(SetDefaultBuildRelWithDebInfo) # Default builds to release with debug info
include(AlwaysColourCompilation) # Always show coloured compiler output
set(CMAKE_EXPORT_COMPILE_COMMANDS ON) # Generate compile_commands.json
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD 14)

find_package(Python REQUIRED COMPONENTS Interpreter Development)
find_package(CCTBX COMPONENTS scitbx cctbx REQUIRED)
Expand Down
1 change: 1 addition & 0 deletions newsfragments/557.misc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Upgrade CMake build to use C++14 by default.

0 comments on commit bdf304b

Please sign in to comment.