tinyxml2: fix disable shared patch

This commit is contained in:
cvh 2016-05-02 21:56:13 +02:00
parent 660fc30960
commit 9d4ae910eb

View File

@ -1,9 +1,8 @@
diff -Naur a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt 2013-10-26 21:52:35.000000000 -0700
+++ b/CMakeLists.txt 2016-04-17 13:49:47.504923855 -0700
@@ -51,26 +51,12 @@
add_library(tinyxml2static STATIC tinyxml2.cpp tinyxml2.h)
set_target_properties(tinyxml2static PROPERTIES OUTPUT_NAME tinyxml2)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -51,26 +51,12 @@ if(BUILD_STATIC_LIBS)
add_library(tinyxml2static STATIC tinyxml2.cpp tinyxml2.h)
set_target_properties(tinyxml2static PROPERTIES OUTPUT_NAME tinyxml2)
endif(BUILD_STATIC_LIBS)
-add_library(tinyxml2 SHARED tinyxml2.cpp tinyxml2.h)
-set_target_properties(tinyxml2 PROPERTIES
@ -19,9 +18,9 @@ diff -Naur a/CMakeLists.txt b/CMakeLists.txt
if(BUILD_STATIC_LIBS)
- install(TARGETS tinyxml2 tinyxml2static
+ install(TARGETS tinyxml2static
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
-else(BUILD_STATIC_LIBS)
- install(TARGETS tinyxml2
- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}