Lines 1-18
Link Here
|
1 |
--- scripts/CMakeLists.txt.orig 2015-03-25 03:19:09 UTC |
1 |
--- scripts/CMakeLists.txt.orig 2015-10-19 06:15:50.000000000 +0300 |
2 |
+++ scripts/CMakeLists.txt |
2 |
+++ scripts/CMakeLists.txt 2016-06-04 00:25:19.436479000 +0300 |
3 |
@@ -16,19 +16,16 @@ if(DEFINED BUILD_DEFINES) |
3 |
@@ -19,11 +19,8 @@ |
4 |
add_definitions(${BUILD_DEFINES}) |
4 |
endforeach() |
5 |
endif() |
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}) |
9 |
-else() |
9 |
-else() |
10 |
- add_library(pugixml STATIC ${SOURCES}) |
10 |
- add_library(pugixml STATIC ${SOURCES}) |
11 |
-endif() |
11 |
-endif() |
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.6 SOVERSION 1) |
15 |
# Enable C++11 long long for compilers that are capable of it |
|
|
16 |
if(NOT ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} STRLESS 3.1) |
17 |
@@ -31,15 +28,15 @@ |
18 |
endif() |
19 |
|
20 |
set_target_properties(pugixml PROPERTIES VERSION 1.7 SOVERSION 1) |
16 |
+set_target_properties(pugixml_static PROPERTIES OUTPUT_NAME pugixml) |
21 |
+set_target_properties(pugixml_static PROPERTIES OUTPUT_NAME pugixml) |
17 |
|
22 |
|
18 |
-install(TARGETS pugixml EXPORT pugixml-config |
23 |
-install(TARGETS pugixml EXPORT pugixml-config |
Lines 24-26
Link Here
|
24 |
|
29 |
|
25 |
install(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) |
30 |
install(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) |
26 |
-install(EXPORT pugixml-config DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/pugixml) |
31 |
-install(EXPORT pugixml-config DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/pugixml) |
|
|
32 |
|
33 |
if(BUILD_TESTS) |
34 |
file(GLOB TEST_SOURCES ../tests/*.cpp) |