[Pkg-owncloud-commits] [owncloud-client] 254/333: Only build the static library when BUILD_LIBRARIES_ONLY is defined

Sandro Knauß hefee-guest at moszumanska.debian.org
Thu Apr 17 23:17:00 UTC 2014


This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 36a2c861c25df1fed8bab20ab2ef306a2e26ef3e
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Fri Mar 28 09:34:21 2014 +0100

    Only build the static library when BUILD_LIBRARIES_ONLY is defined
---
 src/CMakeLists.txt | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 00f63fa..82ec37d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -195,22 +195,28 @@ if(NEON_FOUND)
 endif()
 
 add_library(${synclib_NAME} SHARED ${libsync_SRCS} ${syncMoc})
-add_library(${synclib_NAME}_static STATIC ${libsync_SRCS} ${syncMoc})
-
 qt5_use_modules(${synclib_NAME} Widgets Network Xml WebKitWidgets Sql)
-qt5_use_modules(${synclib_NAME}_static Widgets Network Xml WebKitWidgets Sql)
 
 set_target_properties( ${synclib_NAME}  PROPERTIES
 	VERSION ${MIRALL_VERSION}
 	SOVERSION ${MIRALL_SOVERSION}
 )
-set_target_properties( ${synclib_NAME}_static  PROPERTIES
-	VERSION ${MIRALL_VERSION}
-	SOVERSION ${MIRALL_SOVERSION}
-)
 
 target_link_libraries(${synclib_NAME} ${libsync_LINK_TARGETS} )
-target_link_libraries(${synclib_NAME}_static ${libsync_LINK_TARGETS} )
+
+if(BUILD_LIBRARIES_ONLY)
+    add_library(${synclib_NAME}_static STATIC ${libsync_SRCS} ${syncMoc})
+    qt5_use_modules(${synclib_NAME}_static Widgets Network Xml WebKitWidgets Sql)
+
+    set_target_properties( ${synclib_NAME}_static  PROPERTIES
+        VERSION ${MIRALL_VERSION}
+        SOVERSION ${MIRALL_SOVERSION}
+    )
+
+    target_link_libraries(${synclib_NAME}_static ${libsync_LINK_TARGETS} )
+endif()
+
+
 
 if(NOT BUILD_OWNCLOUD_OSX_BUNDLE)
     install(TARGETS ${synclib_NAME}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git



More information about the Pkg-owncloud-commits mailing list