Skip to content

Commit 0c1c076

Browse files
ya1gauravcdunn2001
authored andcommitted
Use standard CMake variables - static/shared lib.
Replaced JSONCPP_LIB_BUILD_SHARED => BUILD_SHARED_LIBS Moved definition DJSON_DLL to line 11.
1 parent 1113099 commit 0c1c076

File tree

1 file changed

+7
-10
lines changed

1 file changed

+7
-10
lines changed

src/test_lib_json/CMakeLists.txt

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,38 @@
11
# vim: et ts=4 sts=4 sw=4 tw=0
22

3-
IF(JSONCPP_LIB_BUILD_SHARED)
4-
ADD_DEFINITIONS( -DJSON_DLL )
5-
ENDIF(JSONCPP_LIB_BUILD_SHARED)
6-
73
ADD_EXECUTABLE( jsoncpp_test
84
jsontest.cpp
95
jsontest.h
106
main.cpp
117
)
128

139

14-
IF(JSONCPP_LIB_BUILD_SHARED)
10+
IF(BUILD_SHARED_LIBS)
11+
ADD_DEFINITIONS( -DJSON_DLL )
1512
TARGET_LINK_LIBRARIES(jsoncpp_test jsoncpp_lib)
16-
ELSE(JSONCPP_LIB_BUILD_SHARED)
13+
ELSE(BUILD_SHARED_LIBS)
1714
TARGET_LINK_LIBRARIES(jsoncpp_test jsoncpp_lib_static)
18-
ENDIF(JSONCPP_LIB_BUILD_SHARED)
15+
ENDIF(BUILD_SHARED_LIBS)
1916

2017
# another way to solve issue #90
2118
#set_target_properties(jsoncpp_test PROPERTIES COMPILE_FLAGS -ffloat-store)
2219

2320
# Run unit tests in post-build
2421
# (default cmake workflow hides away the test result into a file, resulting in poor dev workflow?!?)
2522
IF(JSONCPP_WITH_POST_BUILD_UNITTEST)
26-
IF(JSONCPP_LIB_BUILD_SHARED)
23+
IF(BUILD_SHARED_LIBS)
2724
# First, copy the shared lib, for Microsoft.
2825
# Then, run the test executable.
2926
ADD_CUSTOM_COMMAND( TARGET jsoncpp_test
3027
POST_BUILD
3128
COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:jsoncpp_lib> $<TARGET_FILE_DIR:jsoncpp_test>
3229
COMMAND $<TARGET_FILE:jsoncpp_test>)
33-
ELSE(JSONCPP_LIB_BUILD_SHARED)
30+
ELSE(BUILD_SHARED_LIBS)
3431
# Just run the test executable.
3532
ADD_CUSTOM_COMMAND( TARGET jsoncpp_test
3633
POST_BUILD
3734
COMMAND $<TARGET_FILE:jsoncpp_test>)
38-
ENDIF(JSONCPP_LIB_BUILD_SHARED)
35+
ENDIF(BUILD_SHARED_LIBS)
3936
ENDIF(JSONCPP_WITH_POST_BUILD_UNITTEST)
4037

4138
SET_TARGET_PROPERTIES(jsoncpp_test PROPERTIES OUTPUT_NAME jsoncpp_test)

0 commit comments

Comments
 (0)