1 From 69acf13fa679628259063c4d0cd17e59b8bb0b75 Mon Sep 17 00:00:00 2001
2 From: xantares <xantares09@hotmail.com>
3 Date: Fri, 14 Nov 2014 19:40:58 +0100
4 Subject: [PATCH] Use BUILD_SHARED_LIBS cmake standard.
6 Signed-off-by: Romain Naour <romain.naour@openwide.fr>
8 CMakeLists.txt | 27 +++++++++------------------
9 1 file changed, 9 insertions(+), 18 deletions(-)
11 diff --git a/CMakeLists.txt b/CMakeLists.txt
12 index 91c61a4..4375bb9 100644
15 @@ -10,8 +10,8 @@ include(GNUInstallDirs)
16 ################################
\r
17 # set lib version here
\r
19 -set(GENERIC_LIB_VERSION "2.2.0")
20 -set(GENERIC_LIB_SOVERSION "2")
21 +set(GENERIC_LIB_VERSION "2.2.0")
\r
22 +set(GENERIC_LIB_SOVERSION "2")
\r
25 ################################
\r
26 @@ -46,12 +46,8 @@ endif(MSVC)
28 ################################
\r
30 -set(BUILD_STATIC_LIBS ON CACHE BOOL "Set to ON to build static libraries")
\r
31 -if(BUILD_STATIC_LIBS)
\r
32 - add_library(tinyxml2static STATIC tinyxml2.cpp tinyxml2.h)
\r
33 - set_target_properties(tinyxml2static PROPERTIES OUTPUT_NAME tinyxml2)
\r
34 -endif(BUILD_STATIC_LIBS)
\r
35 -add_library(tinyxml2 SHARED tinyxml2.cpp tinyxml2.h)
\r
36 +option(BUILD_SHARED_LIBS "build shared or static libraries" ON)
\r
37 +add_library(tinyxml2 tinyxml2.cpp tinyxml2.h)
\r
38 set_target_properties(tinyxml2 PROPERTIES
\r
39 COMPILE_DEFINITIONS "TINYXML2_EXPORT"
\r
40 VERSION "${GENERIC_LIB_VERSION}"
\r
41 @@ -63,16 +59,11 @@ add_dependencies(test ${TARGET_DATA_COPY})
42 target_link_libraries(test tinyxml2)
\r
45 -if(BUILD_STATIC_LIBS)
\r
46 - install(TARGETS tinyxml2 tinyxml2static
\r
47 - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
\r
48 - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
\r
49 - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
\r
50 -else(BUILD_STATIC_LIBS)
\r
51 - install(TARGETS tinyxml2
\r
52 - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
\r
53 - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
\r
54 -endif(BUILD_STATIC_LIBS)
\r
55 +install(TARGETS tinyxml2
\r
56 + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
\r
57 + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
\r
58 + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
\r
60 install(FILES tinyxml2.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
\r
62 foreach(p LIB INCLUDE)
\r