Attachment #146175 for bug #192634

View | Details | Raw Unified | Return to bug 192634
Collapse All | Expand All

Lines 13-18 Link Here

(-)Makefile (-2 lines)
13	USES= cmake	13	USES= cmake
14	CMAKE_SOURCE_PATH= ${WRKSRC}/scripts	14	CMAKE_SOURCE_PATH= ${WRKSRC}/scripts
15		15
16	PLIST_FILES= include/pugiconfig.hpp include/pugixml.hpp lib/libpugixml.a
17
18	.include <bsd.port.mk>	16	.include <bsd.port.mk>




--- ./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)

Line 0 Link Here

(-)pkg-plist (+6 lines)
	1	include/pugiconfig.hpp
	2	include/pugixml.hpp
	3	lib/libpugixml.a
	4	lib/libpugixml.so
	5	lib/libpugixml.so.1
	6	lib/libpugixml.so.1.4

Return to bug 192634

Line 0 Link Here

(-)files/patch-scripts__CMakeLists.txt (+20 lines)
	1	--- ./scripts/CMakeLists.txt.orig 2014-08-23 08:28:21.562183999 -0400
	2	+++ ./scripts/CMakeLists.txt 2014-08-23 08:41:29.301439998 -0400
	3	@@ -10,13 +10,11 @@
	4	set(HEADERS ../src/pugixml.hpp ../src/pugiconfig.hpp)
	5	set(SOURCES ${HEADERS} ../src/pugixml.cpp)
	6
	7	-if(BUILD_SHARED_LIBS)
	8	- add_library(pugixml SHARED ${SOURCES})
	9	-else()
	10	- add_library(pugixml STATIC ${SOURCES})
	11	-endif()
	12	+add_library(pugixml SHARED ${SOURCES})
	13	+add_library(pugixml_static STATIC ${SOURCES})
	14
	15	set_target_properties(pugixml PROPERTIES VERSION 1.4 SOVERSION 1)
	16	+set_target_properties(pugixml_static PROPERTIES OUTPUT_NAME pugixml)
	17
	18	-install(TARGETS pugixml LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
	19	+install(TARGETS pugixml pugixml_static LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
	20	install(FILES ${HEADERS} DESTINATION include)