]> granicus.if.org Git - json-c/commitdiff
Resolve windows name conflict
authorLiang, Gao <liang.gao@intel.com>
Mon, 21 May 2018 08:28:06 +0000 (16:28 +0800)
committerLiang, Gao <liang.gao@intel.com>
Mon, 21 May 2018 08:34:13 +0000 (16:34 +0800)
1. The windows dll will output the lib and dll, and rename the static
    lib will have conflict on windows.
2. Delete rename code to dismiss the conflict.

CMakeLists.txt

index 36b61a5b599ad3b714b8ad3e9d1d2b1df0513435..e0b2960178a51e60f47d2947b0bbab2294c65727 100644 (file)
@@ -114,7 +114,9 @@ add_library(json-c-static
 
 set_property(TARGET json-c PROPERTY C_STANDARD 99)
 set_property(TARGET json-c-static PROPERTY C_STANDARD 99)
+if (NOT MSVC)
 set_target_properties(json-c-static PROPERTIES OUTPUT_NAME json-c)
+endif()
 
 install(TARGETS json-c json-c-static
     RUNTIME DESTINATION bin