mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-27 20:56:55 +00:00
Merge pull request #179 from MilhouseVH/tiny_shared_7.0
tinyxml2: really disable shared (backport)
This commit is contained in:
commit
eca9b41c10
@ -0,0 +1,31 @@
|
|||||||
|
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)
|
||||||
|
endif(BUILD_STATIC_LIBS)
|
||||||
|
-add_library(tinyxml2 SHARED tinyxml2.cpp tinyxml2.h)
|
||||||
|
-set_target_properties(tinyxml2 PROPERTIES
|
||||||
|
- VERSION "${GENERIC_LIB_VERSION}"
|
||||||
|
- SOVERSION "${GENERIC_LIB_SOVERSION}")
|
||||||
|
-
|
||||||
|
-add_executable(test xmltest.cpp)
|
||||||
|
-add_dependencies(test tinyxml2)
|
||||||
|
-add_dependencies(test ${TARGET_DATA_COPY})
|
||||||
|
-target_link_libraries(test tinyxml2)
|
||||||
|
-
|
||||||
|
|
||||||
|
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})
|
||||||
|
-else(BUILD_STATIC_LIBS)
|
||||||
|
- install(TARGETS tinyxml2
|
||||||
|
- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
||||||
|
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
||||||
|
endif(BUILD_STATIC_LIBS)
|
||||||
|
install(FILES tinyxml2.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
|
||||||
|
|
Loading…
x
Reference in New Issue
Block a user