From ea5c24d69b737e62a54013a4238eab0a2ab62818 Mon Sep 17 00:00:00 2001 From: Adam Weinberger Date: Mon, 25 Aug 2014 15:12:10 +0000 Subject: [PATCH] Install both the shared and static library. Approved by: maintainer --- textproc/pugixml/Makefile | 2 -- .../files/patch-scripts__CMakeLists.txt | 20 +++++++++++++++++++ textproc/pugixml/pkg-plist | 6 ++++++ 3 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 textproc/pugixml/files/patch-scripts__CMakeLists.txt create mode 100644 textproc/pugixml/pkg-plist diff --git a/textproc/pugixml/Makefile b/textproc/pugixml/Makefile index 84f4fc29f02e..3113c0e93a18 100644 --- a/textproc/pugixml/Makefile +++ b/textproc/pugixml/Makefile @@ -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 diff --git a/textproc/pugixml/files/patch-scripts__CMakeLists.txt b/textproc/pugixml/files/patch-scripts__CMakeLists.txt new file mode 100644 index 000000000000..a56e6981ee5e --- /dev/null +++ b/textproc/pugixml/files/patch-scripts__CMakeLists.txt @@ -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) diff --git a/textproc/pugixml/pkg-plist b/textproc/pugixml/pkg-plist new file mode 100644 index 000000000000..f759640837f6 --- /dev/null +++ b/textproc/pugixml/pkg-plist @@ -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