open-source-parsers/jsoncpp
1
0
Fork 0
mirror of https://github.com/open-source-parsers/jsoncpp.git synced 2025-10-22 08:20:47 +08:00
Code Issues Releases Wiki Activity

Merge pull request #932 from oleurodecision/cmake_clean

Browse Source 
cmake cleanup
This commit is contained in:
Jordan Bayles
2019-06-25 13:59:46 -07:00
committed by GitHub
parent 2d211de06e 85f5b1c8f9
commit 2a3ae0e79f
5 changed files with 22 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
CMakeLists.txt
View File

@@ -66,7 +66,6 @@ project(JSONCPP
VERSION 1.9.0 # <major>[.<minor>[.<patch>[.<tweak>]]] VERSION 1.9.0 # <major>[.<minor>[.<patch>[.<tweak>]]]
LANGUAGES CXX) LANGUAGES CXX)
set( JSONCPP_VERSION ${JSONCPP_VERSION_MAJOR}.${JSONCPP_VERSION_MINOR}.${JSONCPP_VERSION_PATCH} )
message(STATUS "JsonCpp Version: ${JSONCPP_VERSION_MAJOR}.${JSONCPP_VERSION_MINOR}.${JSONCPP_VERSION_PATCH}") message(STATUS "JsonCpp Version: ${JSONCPP_VERSION_MAJOR}.${JSONCPP_VERSION_MINOR}.${JSONCPP_VERSION_PATCH}")
set( JSONCPP_SOVERSION 21 ) set( JSONCPP_SOVERSION 21 )
@@ -88,11 +87,6 @@ include(GNUInstallDirs)
set(DEBUG_LIBNAME_SUFFIX "" CACHE STRING "Optional suffix to append to the library name for a debug build") set(DEBUG_LIBNAME_SUFFIX "" CACHE STRING "Optional suffix to append to the library name for a debug build")
# Set variable named ${VAR_NAME} to value ${VALUE}
function(set_using_dynamic_name VAR_NAME VALUE)
set( "${VAR_NAME}" "${VALUE}" PARENT_SCOPE)
endfunction()
set(JSONCPP_USE_SECURE_MEMORY "0" CACHE STRING "-D...=1 to use memory-wiping allocator for STL" ) set(JSONCPP_USE_SECURE_MEMORY "0" CACHE STRING "-D...=1 to use memory-wiping allocator for STL" )
# File version.h is only regenerated on CMake configure step # File version.h is only regenerated on CMake configure step
@@ -107,11 +101,11 @@ macro(UseCompilationWarningAsError)
if(MSVC) if(MSVC)
# Only enabled in debug because some old versions of VS STL generate # Only enabled in debug because some old versions of VS STL generate
# warnings when compiled in release configuration. # warnings when compiled in release configuration.
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /WX ") add_compile_options($<$<CONFIG:Debug>:/WX>)
elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror") add_compile_options(-Werror)
if(JSONCPP_WITH_STRICT_ISO) if(JSONCPP_WITH_STRICT_ISO)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic-errors") add_compile_options(-pedantic-errors)
endif() endif()
endif() endif()
endmacro() endmacro()
@@ -122,29 +116,29 @@ include_directories( ${jsoncpp_SOURCE_DIR}/include )
if(MSVC) if(MSVC)
# Only enabled in debug because some old versions of VS STL generate # Only enabled in debug because some old versions of VS STL generate
# unreachable code warning when compiled in release configuration. # unreachable code warning when compiled in release configuration.
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /W4 ") add_compile_options($<$<CONFIG:Debug>:/W4>)
endif() endif()
if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
# using regular Clang or AppleClang # using regular Clang or AppleClang
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wconversion -Wshadow -Werror=conversion -Werror=sign-compare") add_compile_options(-Wall -Wconversion -Wshadow -Werror=conversion -Werror=sign-compare)
elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
# using GCC # using GCC
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wconversion -Wshadow -Wextra") add_compile_options(-Wall -Wconversion -Wshadow -Wextra)
# not yet ready for -Wsign-conversion # not yet ready for -Wsign-conversion
if(JSONCPP_WITH_STRICT_ISO) if(JSONCPP_WITH_STRICT_ISO)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic") add_compile_options(-pedantic)
endif() endif()
if(JSONCPP_WITH_WARNING_AS_ERROR) if(JSONCPP_WITH_WARNING_AS_ERROR)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=conversion") add_compile_options(-Werror=conversion)
endif() endif()
elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Intel") elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
# using Intel compiler # using Intel compiler
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wconversion -Wshadow -Wextra -Werror=conversion") add_compile_options(-Wall -Wconversion -Wshadow -Wextra -Werror=conversion)
if(JSONCPP_WITH_STRICT_ISO AND NOT JSONCPP_WITH_WARNING_AS_ERROR) if(JSONCPP_WITH_STRICT_ISO AND NOT JSONCPP_WITH_WARNING_AS_ERROR)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic") add_compile_options(-pedantic)
endif() endif()
endif() endif()

2
src/jsontestrunner/CMakeLists.txt
View File

@@ -5,7 +5,7 @@ add_executable(jsontestrunner_exe
) )
if(BUILD_SHARED_LIBS) if(BUILD_SHARED_LIBS)
add_definitions( -DJSON_DLL ) add_compile_definitions( JSON_DLL )
endif() endif()
target_link_libraries(jsontestrunner_exe jsoncpp_lib) target_link_libraries(jsontestrunner_exe jsoncpp_lib)

4
src/lib_json/CMakeLists.txt
View File

@@ -34,7 +34,7 @@ endif()
if(NOT (HAVE_CLOCALE AND HAVE_LCONV_SIZE AND HAVE_DECIMAL_POINT AND HAVE_LOCALECONV)) if(NOT (HAVE_CLOCALE AND HAVE_LCONV_SIZE AND HAVE_DECIMAL_POINT AND HAVE_LOCALECONV))
message(WARNING "Locale functionality is not supported") message(WARNING "Locale functionality is not supported")
add_definitions(-DJSONCPP_NO_LOCALE_SUPPORT) add_compile_definitions(JSONCPP_NO_LOCALE_SUPPORT)
endif() endif()
set( JSONCPP_INCLUDE_DIR ../../include ) set( JSONCPP_INCLUDE_DIR ../../include )
@@ -68,7 +68,7 @@ else(JSONCPP_WITH_CMAKE_PACKAGE)
endif() endif()
if(BUILD_SHARED_LIBS) if(BUILD_SHARED_LIBS)
add_definitions( -DJSON_DLL_BUILD ) add_compile_definitions( JSON_DLL_BUILD )
endif() endif()

2
src/test_lib_json/CMakeLists.txt
View File

@@ -8,7 +8,7 @@ add_executable( jsoncpp_test
if(BUILD_SHARED_LIBS) if(BUILD_SHARED_LIBS)
add_definitions( -DJSON_DLL ) add_compile_definitions( JSON_DLL )
endif() endif()
target_link_libraries(jsoncpp_test jsoncpp_lib) target_link_libraries(jsoncpp_test jsoncpp_lib)