Skip to content

Commit 2faf52f

Browse files
authored
Merge pull request #699 from mloskot/ml/cmake-bump-cxxstd-11-to-14
build: Update CMAKE_CXX_STANDARD from 11 to 14
2 parents 27826a7 + 1049c07 commit 2faf52f

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ target_link_libraries(boost_gil
3636
Boost::variant2
3737
)
3838

39-
target_compile_features(boost_gil INTERFACE cxx_std_11)
39+
target_compile_features(boost_gil INTERFACE cxx_std_14)
4040

4141
else()
4242

@@ -60,14 +60,14 @@ option(BOOST_GIL_ENABLE_EXT_RASTERIZATION "Enable Rasterization extension and te
6060
option(BOOST_GIL_ENABLE_EXT_IMAGE_PROCESSING "Enable Image Processing extension (!) and tests" ON)
6161
option(BOOST_GIL_USE_CONAN "Use Conan to install dependencies" OFF)
6262
option(BOOST_GIL_USE_CLANG_TIDY "Set CMAKE_CXX_CLANG_TIDY property on targets to enable clang-tidy linting" OFF)
63-
set(CMAKE_CXX_STANDARD 11 CACHE STRING "C++ standard version to use (default is 11)")
63+
set(CMAKE_CXX_STANDARD 14 CACHE STRING "C++ standard version to use (default is 14)")
6464

6565
#-----------------------------------------------------------------------------
6666
# Project
6767
#-----------------------------------------------------------------------------
6868
project(Boost.GIL
6969
LANGUAGES CXX
70-
DESCRIPTION "Boost.GIL - Generic Image Library | Requires C++11 since Boost 1.68")
70+
DESCRIPTION "Boost.GIL - Generic Image Library | Requires C++14 since Boost 1.80")
7171

7272
list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_BINARY_DIR}/cmake)
7373

@@ -140,7 +140,7 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
140140
set(Boost_USE_STATIC_RUNTIME OFF)
141141
endif()
142142

143-
find_package(Boost 1.72.0 REQUIRED COMPONENTS filesystem)
143+
find_package(Boost 1.80.0 REQUIRED COMPONENTS filesystem)
144144
message(STATUS "Boost.GIL: Using Boost_INCLUDE_DIRS=${Boost_INCLUDE_DIRS}")
145145
message(STATUS "Boost.GIL: Using Boost_LIBRARY_DIRS=${Boost_LIBRARY_DIRS}")
146146

test/extension/toolbox/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ foreach(_name
2929
set(_target test_ext_toolbox_${_name})
3030

3131
add_executable(${_target} "")
32-
target_sources(${_target} PRIVATE ${_name})
32+
target_sources(${_target} PRIVATE "${_name}.cpp")
3333
target_link_libraries(${_target}
3434
PRIVATE
3535
gil_compile_options
@@ -50,7 +50,7 @@ foreach(_name
5050
set(_target test_ext_toolbox_${_name})
5151

5252
add_executable(${_target} "")
53-
target_sources(${_target} PRIVATE ${_name})
53+
target_sources(${_target} PRIVATE "${_name}.cpp")
5454
target_link_libraries(${_target}
5555
PRIVATE
5656
gil_compile_options

0 commit comments

Comments
 (0)