[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdesupport/taglib
From:       Lukáš Lalinský <lalinsky () gmail ! com>
Date:       2009-09-08 8:52:57
Message-ID: 1252399977.636384.12176.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1021124 by lalinsky:

Add option for building a static version of taglib

 M  +2 -0      CMakeLists.txt  
 M  +3 -0      bindings/c/CMakeLists.txt  
 M  +6 -1      taglib/CMakeLists.txt  
 M  +1 -1      taglib/taglib_export.h  


--- trunk/kdesupport/taglib/CMakeLists.txt #1021123:1021124
@@ -2,6 +2,8 @@
 
 cmake_minimum_required(VERSION 2.6.0 FATAL_ERROR)
 
+OPTION(ENABLE_STATIC "Make static version of libtag"  OFF)
+
 OPTION(BUILD_TESTS "Build the test suite"  OFF)
 OPTION(BUILD_EXAMPLES "Build the examples"  OFF)
 
--- trunk/kdesupport/taglib/bindings/c/CMakeLists.txt #1021123:1021124
@@ -19,6 +19,9 @@
 ########### next target ###############
 
 ADD_LIBRARY(tag_c SHARED tag_c.cpp)
+if(ENABLE_STATIC)
+    set_target_properties(tag_c PROPERTIES COMPILE_DEFINITIONS TAGLIB_STATIC)
+endif(ENABLE_STATIC)
 
 TARGET_LINK_LIBRARIES(tag_c  tag )
 
--- trunk/kdesupport/taglib/taglib/CMakeLists.txt #1021123:1021124
@@ -184,7 +184,12 @@
 )
 
 
-ADD_LIBRARY(tag SHARED ${tag_LIB_SRCS})
+if(ENABLE_STATIC)
+    add_library(tag STATIC ${tag_LIB_SRCS})
+    set_target_properties(tag PROPERTIES COMPILE_DEFINITIONS TAGLIB_STATIC)
+else(ENABLE_STATIC)
+    add_library(tag SHARED ${tag_LIB_SRCS})
+endif(ENABLE_STATIC)
 
 TARGET_LINK_LIBRARIES(tag )
 if(ZLIB_FOUND)
--- trunk/kdesupport/taglib/taglib/taglib_export.h #1021123:1021124
@@ -26,7 +26,7 @@
 #ifndef TAGLIB_EXPORT_H
 #define TAGLIB_EXPORT_H
 
-#if defined(_WIN32) || defined(_WIN64)
+#if !defined(TAGLIB_STATIC) && (defined(_WIN32) || defined(_WIN64))
 #ifdef MAKE_TAGLIB_LIB
 #define TAGLIB_EXPORT __declspec(dllexport)
 #else
[prev in list] [next in list] [prev in thread] [next in thread]