[Pkg-owncloud-commits] [owncloud-client] 09/70: Auto generate the Export header.

[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 7f7154ed40104821ba40457b34ccd6983bdf77ad
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Wed Apr 30 13:54:47 2014 +0200

    Auto generate the Export header.
    
    This should fix oem builds.
---
 src/CMakeLists.txt       |  9 +++++++++
 src/mirall/owncloudlib.h | 20 --------------------
 2 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d042a08..3085c10 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,5 @@
 set(CMAKE_AUTOMOC TRUE)
+include(GenerateExportHeader)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 
@@ -195,6 +196,14 @@ if(NEON_FOUND)
 endif()
 
 add_library(${synclib_NAME} SHARED ${libsync_SRCS} ${syncMoc})
+GENERATE_EXPORT_HEADER( ${synclib_NAME}
+	BASE_NAME ${synclib_NAME}
+	EXPORT_MACRO_NAME OWNCLOUDSYNC_EXPORT
+        EXPORT_FILE_NAME owncloudlib.h
+	STATIC_DEFINE OWNCLOUD_BUILT_AS_STATIC
+)
+
+
 if(TOKEN_AUTH_ONLY)
     qt5_use_modules(${synclib_NAME} Network Xml Sql)
 else()
diff --git a/src/mirall/owncloudlib.h b/src/mirall/owncloudlib.h
deleted file mode 100644
index 10fede3..0000000
--- a/src/mirall/owncloudlib.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (C) by Olivier Goffart <ogoffart at owncloud.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * for more details.
- */
-
-#pragma once
-
-#ifdef owncloudsync_EXPORTS
-#define OWNCLOUDSYNC_EXPORT Q_DECL_EXPORT
-#else
-#define OWNCLOUDSYNC_EXPORT Q_DECL_IMPORT
-#endif

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