Date: Mon, 25 Aug 2014 15:12:11 +0000 (UTC) From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r366086 - in head/textproc/pugixml: . files Message-ID: <201408251512.s7PFCBaW053600@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Mon Aug 25 15:12:10 2014 New Revision: 366086 URL: http://svnweb.freebsd.org/changeset/ports/366086 QAT: https://qat.redports.org/buildarchive/r366086/ Log: Install both the shared and static library. Approved by: maintainer Added: head/textproc/pugixml/files/ head/textproc/pugixml/files/patch-scripts__CMakeLists.txt (contents, props changed) head/textproc/pugixml/pkg-plist (contents, props changed) Modified: head/textproc/pugixml/Makefile Modified: head/textproc/pugixml/Makefile ============================================================================== --- head/textproc/pugixml/Makefile Mon Aug 25 15:11:46 2014 (r366085) +++ head/textproc/pugixml/Makefile Mon Aug 25 15:12:10 2014 (r366086) @@ -13,6 +13,4 @@ LICENSE= MIT USES= cmake CMAKE_SOURCE_PATH= ${WRKSRC}/scripts -PLIST_FILES= include/pugiconfig.hpp include/pugixml.hpp lib/libpugixml.a - .include <bsd.port.mk> Added: head/textproc/pugixml/files/patch-scripts__CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/pugixml/files/patch-scripts__CMakeLists.txt Mon Aug 25 15:12:10 2014 (r366086) @@ -0,0 +1,20 @@ +--- ./scripts/CMakeLists.txt.orig 2014-08-23 08:28:21.562183999 -0400 ++++ ./scripts/CMakeLists.txt 2014-08-23 08:41:29.301439998 -0400 +@@ -10,13 +10,11 @@ + set(HEADERS ../src/pugixml.hpp ../src/pugiconfig.hpp) + set(SOURCES ${HEADERS} ../src/pugixml.cpp) + +-if(BUILD_SHARED_LIBS) +- add_library(pugixml SHARED ${SOURCES}) +-else() +- add_library(pugixml STATIC ${SOURCES}) +-endif() ++add_library(pugixml SHARED ${SOURCES}) ++add_library(pugixml_static STATIC ${SOURCES}) + + set_target_properties(pugixml PROPERTIES VERSION 1.4 SOVERSION 1) ++set_target_properties(pugixml_static PROPERTIES OUTPUT_NAME pugixml) + +-install(TARGETS pugixml LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++install(TARGETS pugixml pugixml_static LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + install(FILES ${HEADERS} DESTINATION include) Added: head/textproc/pugixml/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/pugixml/pkg-plist Mon Aug 25 15:12:10 2014 (r366086) @@ -0,0 +1,6 @@ +include/pugiconfig.hpp +include/pugixml.hpp +lib/libpugixml.a +lib/libpugixml.so +lib/libpugixml.so.1 +lib/libpugixml.so.1.4
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408251512.s7PFCBaW053600>