generic-library/jsoncpp
1
0
Fork 0
mirror of https://github.com/open-source-parsers/jsoncpp.git synced 2025-10-18 11:38:59 +02:00
Code Issues Projects 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

2
src/jsontestrunner/CMakeLists.txt
View File

@@ -5,7 +5,7 @@ add_executable(jsontestrunner_exe
)
if(BUILD_SHARED_LIBS)
add_definitions( -DJSON_DLL )
add_compile_definitions( JSON_DLL )
endif()
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))
message(WARNING "Locale functionality is not supported")
add_definitions(-DJSONCPP_NO_LOCALE_SUPPORT)
add_compile_definitions(JSONCPP_NO_LOCALE_SUPPORT)
endif()
set( JSONCPP_INCLUDE_DIR ../../include )
@@ -68,7 +68,7 @@ else(JSONCPP_WITH_CMAKE_PACKAGE)
endif()
if(BUILD_SHARED_LIBS)
add_definitions( -DJSON_DLL_BUILD )
add_compile_definitions( JSON_DLL_BUILD )
endif()

14
src/lib_json/version.h.in
View File

@@ -1,14 +1,14 @@
// DO NOT EDIT. This file (and "version") is generated by CMake.
// Run CMake configure step to update it.
#ifndef JSON_VERSION_H_INCLUDED
# define JSON_VERSION_H_INCLUDED
#define JSON_VERSION_H_INCLUDED
# define JSONCPP_VERSION_STRING "@JSONCPP_VERSION@"
# define JSONCPP_VERSION_MAJOR @JSONCPP_VERSION_MAJOR@
# define JSONCPP_VERSION_MINOR @JSONCPP_VERSION_MINOR@
# define JSONCPP_VERSION_PATCH @JSONCPP_VERSION_PATCH@
# define JSONCPP_VERSION_QUALIFIER
# define JSONCPP_VERSION_HEXA ((JSONCPP_VERSION_MAJOR << 24) | (JSONCPP_VERSION_MINOR << 16) | (JSONCPP_VERSION_PATCH << 8))
#define JSONCPP_VERSION_STRING "@JSONCPP_VERSION@"
#define JSONCPP_VERSION_MAJOR @JSONCPP_VERSION_MAJOR@
#define JSONCPP_VERSION_MINOR @JSONCPP_VERSION_MINOR@
#define JSONCPP_VERSION_PATCH @JSONCPP_VERSION_PATCH@
#define JSONCPP_VERSION_QUALIFIER
#define JSONCPP_VERSION_HEXA ((JSONCPP_VERSION_MAJOR << 24) | (JSONCPP_VERSION_MINOR << 16) | (JSONCPP_VERSION_PATCH << 8))
#ifdef JSONCPP_USING_SECURE_MEMORY
#undef JSONCPP_USING_SECURE_MEMORY

2
src/test_lib_json/CMakeLists.txt
View File

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