[Pkg-owncloud-commits] [owncloud-client] 47/103: Fix compilation on linux with BUILD_LIBRARIES_ONLY

[Sandro Knauß]

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 1338c08622662e353d202f38961586c1eb5ce983
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Tue Apr 22 11:33:38 2014 +0200

    Fix compilation on linux with BUILD_LIBRARIES_ONLY
---
 src/CMakeLists.txt | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ab45510..d042a08 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -115,19 +115,19 @@ if(TOKEN_AUTH_ONLY)
 		${libsync_SRCS}
 		creds/tokencredentials.cpp
 	)
-	else()
-		set (libsync_SRCS
-			${libsync_SRCS}
-	    	creds/httpcredentials.cpp		
-	    	creds/shibbolethcredentials.cpp
-	    	creds/shibboleth/shibbolethaccessmanager.cpp
-	    	creds/shibboleth/shibbolethcookiejar.cpp
-	    	creds/shibboleth/shibbolethwebview.cpp
-	    	creds/shibboleth/shibbolethrefresher.cpp
-	    	creds/shibboleth/shibbolethconfigfile.cpp
-	    	creds/shibboleth/authenticationdialog.cpp
-	    	creds/shibboleth/shibbolethuserjob.cpp
-	)	
+else()
+    set (libsync_SRCS
+        ${libsync_SRCS}
+        creds/httpcredentials.cpp
+        creds/shibbolethcredentials.cpp
+        creds/shibboleth/shibbolethaccessmanager.cpp
+        creds/shibboleth/shibbolethcookiejar.cpp
+        creds/shibboleth/shibbolethwebview.cpp
+        creds/shibboleth/shibbolethrefresher.cpp
+        creds/shibboleth/shibbolethconfigfile.cpp
+        creds/shibboleth/authenticationdialog.cpp
+        creds/shibboleth/shibbolethuserjob.cpp
+    )
 endif()
 
 IF( NOT WIN32 AND NOT APPLE )
@@ -382,17 +382,17 @@ if (WITH_DBUS)
     set(ADDITIONAL_APP_MODULES DBus)
 endif(WITH_DBUS)
 
-if(NOT BUILD_OWNCLOUD_OSX_BUNDLE)
+if(NOT BUILD_OWNCLOUD_OSX_BUNDLE AND NOT BUILD_LIBRARIES_ONLY)
     set(BIN_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
 
-if(NOT WIN32 AND NOT BUILD_LIBRARIES_ONLY)
-	file( GLOB _icons "${theme_dir}/colored/${ICON_APP_NAME}-icon-*.png" )
-    foreach( _file ${_icons} )
-	    string( REPLACE "${theme_dir}/colored/${ICON_APP_NAME}-icon-" "" _res ${_file} )
-        string( REPLACE ".png" "" _res ${_res} )
-	install( FILES ${_file} RENAME ${ICON_APP_NAME}.png DESTINATION ${DATADIR}/icons/hicolor/${_res}x${_res}/apps )
-    endforeach( _file )
-endif(NOT WIN32 AND NOT BUILD_LIBRARIES_ONLY)
+    if(NOT WIN32)
+        file( GLOB _icons "${theme_dir}/colored/${ICON_APP_NAME}-icon-*.png" )
+        foreach( _file ${_icons} )
+            string( REPLACE "${theme_dir}/colored/${ICON_APP_NAME}-icon-" "" _res ${_file} )
+            string( REPLACE ".png" "" _res ${_res} )
+        install( FILES ${_file} RENAME ${ICON_APP_NAME}.png DESTINATION ${DATADIR}/icons/hicolor/${_res}x${_res}/apps )
+        endforeach( _file )
+    endif(NOT WIN32)
 
     install(FILES ${mirall_I18N} DESTINATION share/${APPLICATION_EXECUTABLE}/i18n)
 

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