Attachment 146175 Details for Bug 192634 – Builds shared and static libs

[patch] Builds shared and static libs

pugixml.patch (text/plain), 2.38 KB, created by Adam Weinberger on 2014-08-23 12:45:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adam Weinberger

Created: 2014-08-23 12:45:57 UTC

Size: 2.38 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 365723)
>+++ Makefile	(working copy)
>@@ -13,6 +13,4 @@
> USES=		cmake
> CMAKE_SOURCE_PATH=	${WRKSRC}/scripts
> 
>-PLIST_FILES=	include/pugiconfig.hpp include/pugixml.hpp lib/libpugixml.a
>-
> .include <bsd.port.mk>
>Index: files/patch-scripts__CMakeLists.txt
>===================================================================
>--- files/patch-scripts__CMakeLists.txt	(revision 0)
>+++ files/patch-scripts__CMakeLists.txt	(working copy)
>@@ -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)
>
>Property changes on: files/patch-scripts__CMakeLists.txt
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 0)
>+++ pkg-plist	(working copy)
>@@ -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
>
>Property changes on: pkg-plist
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 192634: 145750 | 146175