External/json
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes after review performed by @ruslo for cmake file in https://github.com/ruslo/hunter/pull/239

Browse Source
This commit is contained in:
Damien Buhl (alias daminetreg) 2015-09-22 21:18:06 +02:00
parent 0b231f45fc
commit f9f0c3641d
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
CMakeLists.txt
View File

@ -1,24 +1,26 @@
cmake_minimum_required(VERSION 3.0.0) cmake_minimum_required(VERSION 3.0.0)
project(json CXX) project(json
LANGUAGES CXX
set (json_VERSION "1.0.0-rc1") VERSION "1.0.0")
add_executable(json_unit add_executable(json_unit
src/json.hpp test/catch.hpp test/unit.cpp src/json.hpp test/catch.hpp test/unit.cpp
) )
if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
set(CMAKE_CXX_FLAGS "-std=c++11 -stdlib=libc++") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
set(CMAKE_CXX_FLAGS "-std=c++11") set(CMAKE_CXX_FLAGS "-std=c++11")
elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
set(CMAKE_CXX_FLAGS "/EHsc") set(CMAKE_CXX_FLAGS "/EHsc")
STRING(REPLACE "/O2" "/Od" CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE}) STRING(REPLACE "/O2" "/Od" CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE})
# See https://msdn.microsoft.com/fr-fr/library/aa985974.aspx?f=255&MSPPError=-2147217396
# Avoid warnings for unsafe STL methods call
add_definitions(-D_SCL_SECURE_NO_WARNINGS) add_definitions(-D_SCL_SECURE_NO_WARNINGS)
endif() endif()
@ -40,7 +42,6 @@ configure_package_config_file(
write_basic_package_version_file( write_basic_package_version_file(
${CMAKE_CURRENT_BINARY_DIR}/nlohmann-json-config-version.cmake ${CMAKE_CURRENT_BINARY_DIR}/nlohmann-json-config-version.cmake
VERSION ${json_VERSION}
COMPATIBILITY AnyNewerVersion) COMPATIBILITY AnyNewerVersion)
install(FILES install(FILES

3
cmake/modules/nlohmann-json-config.cmake.in
View File

@ -19,5 +19,6 @@ if (NOT TARGET "nlohmann-json::nlohmann-json")
add_library("nlohmann-json::nlohmann-json" INTERFACE IMPORTED) add_library("nlohmann-json::nlohmann-json" INTERFACE IMPORTED)
set_target_properties("nlohmann-json::nlohmann-json" set_target_properties("nlohmann-json::nlohmann-json"
PROPERTIES PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES "${NLOHMANN_JSON_INCLUDE_DIRS}") INTERFACE_INCLUDE_DIRECTORIES "${NLOHMANN_JSON_INCLUDE_DIRS}"
INTERFACE_COMPILE_OPTIONS ${NLOHMANN_JSON_DEFINITIONS})
endif() endif()