pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/textproc/jsoncpp/patches jsoncpp: ...and the patch



details:   https://anonhg.NetBSD.org/pkgsrc/rev/da0f083bcf65
branches:  trunk
changeset: 336178:da0f083bcf65
user:      adam <adam%pkgsrc.org@localhost>
date:      Mon Jul 08 18:43:03 2019 +0000

description:
jsoncpp: ...and the patch

diffstat:

 textproc/jsoncpp/patches/patch-src_lib__json_CMakeLists.txt |  15 -------------
 1 files changed, 0 insertions(+), 15 deletions(-)

diffs (19 lines):

diff -r 5cd235074b9f -r da0f083bcf65 textproc/jsoncpp/patches/patch-src_lib__json_CMakeLists.txt
--- a/textproc/jsoncpp/patches/patch-src_lib__json_CMakeLists.txt       Mon Jul 08 18:42:19 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_lib__json_CMakeLists.txt,v 1.1 2019/04/09 07:08:18 wiz Exp $
-
-We're not on Windows, so static libraries can have the same name as shared ones.
-
---- src/lib_json/CMakeLists.txt.orig   2017-12-20 21:07:10.000000000 +0000
-+++ src/lib_json/CMakeLists.txt
-@@ -96,7 +96,7 @@ IF(BUILD_STATIC_LIBS)
-     ADD_LIBRARY(jsoncpp_lib_static STATIC ${PUBLIC_HEADERS} ${jsoncpp_sources})
-     SET_TARGET_PROPERTIES( jsoncpp_lib_static PROPERTIES VERSION ${JSONCPP_VERSION} SOVERSION ${JSONCPP_SOVERSION})
-     # avoid name clashes on windows as the shared import lib is also named jsoncpp.lib
--    if (NOT DEFINED STATIC_SUFFIX AND BUILD_SHARED_LIBS)
-+    if (WINDOWS AND NOT DEFINED STATIC_SUFFIX AND BUILD_SHARED_LIBS)
-       set (STATIC_SUFFIX "_static")
-     endif ()
-     set_target_properties (jsoncpp_lib_static PROPERTIES OUTPUT_NAME jsoncpp${STATIC_SUFFIX}



Home | Main Index | Thread Index | Old Index