fix JSON_DLL definition

jschueller · jschueller · commit 51e0f24cd73d · 2017-07-12T18:01:42.000+02:00
diff --git a/src/jsontestrunner/CMakeLists.txt b/src/jsontestrunner/CMakeLists.txt
@@ -5,8 +5,8 @@ ADD_EXECUTABLE(jsontestrunner_exe
                )
 
 IF(BUILD_SHARED_LIBS)
-    ADD_DEFINITIONS( -DJSON_DLL )
     TARGET_LINK_LIBRARIES(jsontestrunner_exe jsoncpp_lib)
+    SET_TARGET_PROPERTIES(jsontestrunner_exe PROPERTIES COMPILE_DEFINITIONS JSON_DLL)
 ELSE(BUILD_SHARED_LIBS)
     TARGET_LINK_LIBRARIES(jsontestrunner_exe jsoncpp_lib_static)
 ENDIF()
diff --git a/src/test_lib_json/CMakeLists.txt b/src/test_lib_json/CMakeLists.txt
@@ -8,8 +8,8 @@ ADD_EXECUTABLE( jsoncpp_test
 
 
 IF(BUILD_SHARED_LIBS)
-    ADD_DEFINITIONS( -DJSON_DLL )
     TARGET_LINK_LIBRARIES(jsoncpp_test jsoncpp_lib)
+    SET_TARGET_PROPERTIES(jsoncpp_test PROPERTIES COMPILE_DEFINITIONS JSON_DLL)
 ELSE(BUILD_SHARED_LIBS)
     TARGET_LINK_LIBRARIES(jsoncpp_test jsoncpp_lib_static)
 ENDIF()

Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,8 @@ ADD_EXECUTABLE(jsontestrunner_exe`
`5`	`5`	`)`
`6`	`6`
`7`	`7`	`IF(BUILD_SHARED_LIBS)`
`8`		`- ADD_DEFINITIONS( -DJSON_DLL )`
`9`	`8`	`TARGET_LINK_LIBRARIES(jsontestrunner_exe jsoncpp_lib)`
	`9`	`+ SET_TARGET_PROPERTIES(jsontestrunner_exe PROPERTIES COMPILE_DEFINITIONS JSON_DLL)`
`10`	`10`	`ELSE(BUILD_SHARED_LIBS)`
`11`	`11`	`TARGET_LINK_LIBRARIES(jsontestrunner_exe jsoncpp_lib_static)`
`12`	`12`	`ENDIF()`