mirror of
https://github.com/tristanpenman/valijson.git
synced 2024-12-12 10:13:51 +01:00
Update CMakeLists to use add_compile_definitions
This commit is contained in:
parent
f97013928d
commit
c2822576a2
@ -1,4 +1,4 @@
|
||||
cmake_minimum_required(VERSION 3.1)
|
||||
cmake_minimum_required(VERSION 3.1.2)
|
||||
project(valijson)
|
||||
|
||||
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
|
||||
@ -54,12 +54,12 @@ if(NOT valijson_BUILD_TESTS AND NOT valijson_BUILD_EXAMPLES)
|
||||
endif()
|
||||
|
||||
if(valijson_USE_EXCEPTIONS)
|
||||
add_definitions(-DVALIJSON_USE_EXCEPTIONS=1)
|
||||
add_compile_definitions(VALIJSON_USE_EXCEPTIONS=1)
|
||||
else()
|
||||
add_definitions(-D_HAS_EXCEPTIONS=0)
|
||||
add_definitions(-DBOOST_NO_EXCEPTIONS)
|
||||
add_definitions(-DJSON_USE_EXCEPTION=0)
|
||||
add_definitions(-DVALIJSON_USE_EXCEPTIONS=0)
|
||||
add_compile_definitions(_HAS_EXCEPTIONS=0)
|
||||
add_compile_definitions(BOOST_NO_EXCEPTIONS)
|
||||
add_compile_definitions(JSON_USE_EXCEPTION=0)
|
||||
add_compile_definitions(VALIJSON_USE_EXCEPTIONS=0)
|
||||
endif()
|
||||
|
||||
find_package(Poco OPTIONAL_COMPONENTS JSON)
|
||||
@ -175,7 +175,7 @@ if(valijson_BUILD_TESTS)
|
||||
set_target_properties(test_suite PROPERTIES COMPILE_DEFINITIONS "PICOJSON_USE_INT64")
|
||||
|
||||
if(Boost_FOUND)
|
||||
add_definitions(-DBOOST_ALL_DYN_LINK)
|
||||
add_compile_definitions(BOOST_ALL_DYN_LINK)
|
||||
set(Boost_USE_STATIC_LIBS OFF)
|
||||
set(Boost_USE_MULTITHREADED ON)
|
||||
set(Boost_USE_STATIC_RUNTIME OFF)
|
||||
|
Loading…
Reference in New Issue
Block a user