File tree 3 files changed +6
-6
lines changed
3 files changed +6
-6
lines changed Original file line number Diff line number Diff line change 1
- cmake_minimum_required (VERSION 3.5)
1
+ cmake_minimum_required (VERSION 3.5...3.14 )
2
2
3
3
project (jsoncons CXX)
4
4
@@ -60,7 +60,7 @@ configure_package_config_file(cmake/Config.cmake
60
60
61
61
# jsoncons is header-only and does not depend on the architecture.
62
62
63
- if (${ CMAKE_VERSION} VERSION_LESS "3.14.0" )
63
+ if (CMAKE_VERSION VERSION_LESS "3.14.0" )
64
64
write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR} /${PROJECT_NAME} ConfigVersion.cmake
65
65
VERSION ${${PROJECT_NAME} _VERSION}
66
66
COMPATIBILITY AnyNewerVersion)
Original file line number Diff line number Diff line change 3
3
# jsoncons examples CMake file
4
4
#
5
5
6
- cmake_minimum_required (VERSION 2.8 )
6
+ cmake_minimum_required (VERSION 3.5...3.14 )
7
7
8
8
# load global config
9
9
include (../../build /cmake/Config.cmake)
@@ -27,7 +27,7 @@ foreach(example_file ${Example_sources})
27
27
# Create an executable with the example name and file
28
28
add_executable (${example_name} ${example_file} )
29
29
30
- if (${ CMAKE_SYSTEM_NAME} STREQUAL "Linux" AND ${ CMAKE_CXX_COMPILER_ID} STREQUAL "Clang" )
30
+ if (( CMAKE_SYSTEM_NAME STREQUAL "Linux" ) AND ( CMAKE_CXX_COMPILER_ID STREQUAL "Clang" ) )
31
31
# special link option on Linux because llvm stl rely on GNU stl
32
32
target_link_libraries (${example_name} -Wl,-lstdc++)
33
33
endif ()
Original file line number Diff line number Diff line change @@ -50,7 +50,7 @@ set(JSONCONS_THIRD_PARTY_INCLUDE_DIR ${JSONCONS_TESTS_DIR}/thirdparty)
50
50
set (CATCH_INCLUDE_DIR ${JSONCONS_THIRD_PARTY_INCLUDE_DIR} /catch)
51
51
add_library (catch INTERFACE )
52
52
53
- if (${ CMAKE_VERSION} VERSION_LESS "3.8.0" )
53
+ if (CMAKE_VERSION VERSION_LESS "3.8.0" )
54
54
target_compile_features (catch INTERFACE cxx_range_for) # for C++11 - flags
55
55
else ()
56
56
target_compile_features (catch INTERFACE cxx_std_11)
@@ -198,7 +198,7 @@ add_executable(unit_tests
198
198
corelib/src/testmain.cpp
199
199
)
200
200
201
- if (${ CMAKE_VERSION} VERSION_LESS "3.8.0" )
201
+ if (CMAKE_VERSION VERSION_LESS "3.8.0" )
202
202
target_compile_features (unit_tests INTERFACE cxx_range_for) # for C++11 - flags
203
203
else ()
204
204
target_compile_features (unit_tests INTERFACE cxx_std_11)
You can’t perform that action at this time.
0 commit comments