|
Lines 1-8
Link Here
|
| 1 |
--- ./scripts/CMakeLists.txt.orig 2014-08-23 08:28:21.562183999 -0400 |
1 |
--- scripts/CMakeLists.txt.orig 2015-03-25 03:19:09 UTC |
| 2 |
+++ ./scripts/CMakeLists.txt 2014-08-23 08:41:29.301439998 -0400 |
2 |
+++ scripts/CMakeLists.txt |
| 3 |
@@ -10,13 +10,11 @@ |
3 |
@@ -16,19 +16,16 @@ if(DEFINED BUILD_DEFINES) |
| 4 |
set(HEADERS ../src/pugixml.hpp ../src/pugiconfig.hpp) |
4 |
add_definitions(${BUILD_DEFINES}) |
| 5 |
set(SOURCES ${HEADERS} ../src/pugixml.cpp) |
5 |
endif() |
| 6 |
|
6 |
|
| 7 |
-if(BUILD_SHARED_LIBS) |
7 |
-if(BUILD_SHARED_LIBS) |
| 8 |
- add_library(pugixml SHARED ${SOURCES}) |
8 |
- add_library(pugixml SHARED ${SOURCES}) |
|
Lines 12-20
Link Here
|
| 12 |
+add_library(pugixml SHARED ${SOURCES}) |
12 |
+add_library(pugixml SHARED ${SOURCES}) |
| 13 |
+add_library(pugixml_static STATIC ${SOURCES}) |
13 |
+add_library(pugixml_static STATIC ${SOURCES}) |
| 14 |
|
14 |
|
| 15 |
set_target_properties(pugixml PROPERTIES VERSION 1.4 SOVERSION 1) |
15 |
set_target_properties(pugixml PROPERTIES VERSION 1.6 SOVERSION 1) |
| 16 |
+set_target_properties(pugixml_static PROPERTIES OUTPUT_NAME pugixml) |
16 |
+set_target_properties(pugixml_static PROPERTIES OUTPUT_NAME pugixml) |
| 17 |
|
17 |
|
| 18 |
-install(TARGETS pugixml LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) |
18 |
-install(TARGETS pugixml EXPORT pugixml-config |
| 19 |
+install(TARGETS pugixml pugixml_static LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) |
19 |
+install(TARGETS pugixml pugixml_static |
| 20 |
install(FILES ${HEADERS} DESTINATION include) |
20 |
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} |
|
|
21 |
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} |
| 22 |
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} |
| 23 |
) |
| 24 |
|
| 25 |
install(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) |
| 26 |
-install(EXPORT pugixml-config DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/pugixml) |