head	1.2;
access;
symbols
	pkgsrc-2019Q2:1.1.0.2
	pkgsrc-2019Q2-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2019.07.08.18.43.03;	author adam;	state dead;
branches;
next	1.1;
commitid	X6pEMr2VcPCFTguB;

1.1
date	2019.04.09.07.08.18;	author wiz;	state Exp;
branches;
next	;
commitid	Jff5zuPGSkUsWDiB;


desc
@@


1.2
log
@jsoncpp: ...and the patch
@
text
@$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}
@


1.1
log
@jsoncpp: update to 1.8.4nb2.

Give static library the same name as the shared one.

Bump dependency in bl3.mk to a version with shared libraries.
@
text
@d1 1
a1 1
$NetBSD$
@