From: Liang, Gao Date: Mon, 21 May 2018 08:28:06 +0000 (+0800) Subject: Resolve windows name conflict X-Git-Tag: json-c-0.14-20200419~119^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F415%2Fhead;p=thirdparty%2Fjson-c.git Resolve windows name conflict 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. --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 36b61a5b..e0b29601 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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