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

List:       kde-commits
Subject:    koffice/kformula
From:       Laurent Montel <montel () kde ! org>
Date:       2007-07-14 21:52:25
Message-ID: 1184449945.537317.19933.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 687964 by mlaurent:

add lib soname
Fix export (fix link under windows)


 M  +3 -0      CMakeLists.txt  
 M  +1 -1      KFormulaPartDocument.h  
 M  +1 -1      KFormulaPartFactory.h  
 M  +2 -0      flake/CMakeLists.txt  
 M  +17 -24    flake/kformula_export.h  


--- trunk/koffice/kformula/CMakeLists.txt #687963:687964
@@ -26,6 +26,9 @@
 
 target_link_libraries(kformulaprivate ${KDE4_KDECORELIBS} koguiutils kformulalib)
 
+set_target_properties(kformulaprivate PROPERTIES VERSION \
${GENERIC_KOFFICE_LIB_VERSION} SOVERSION ${GENERIC_KOFFICE_LIB_SOVERSION} ) +
+
 install(TARGETS kformulaprivate DESTINATION ${LIB_INSTALL_DIR})
 
 ########### next target ###############
--- trunk/koffice/kformula/KFormulaPartDocument.h #687963:687964
@@ -44,7 +44,7 @@
  * The actual data KFormulaPartDocument is maintaining is a list of FormulaShape.
  * 
  */
-class KOFORMULA_EXPORT KFormulaPartDocument : public KoDocument, public \
KoShapeControllerBase { +class KFORMULAPRIVATE_EXPORT KFormulaPartDocument : public \
KoDocument, public KoShapeControllerBase {  Q_OBJECT
 public:
     /// The basic constructor
--- trunk/koffice/kformula/KFormulaPartFactory.h #687963:687964
@@ -36,7 +36,7 @@
  * Use createPartObject() to obtain a pointer to a new instance of the KFormulaPart.
  * With global you can access the current @ref KComponentData of KFormula
  */
-class KOFORMULA_EXPORT KFormulaPartFactory : public KoFactory
+class KFORMULAPRIVATE_EXPORT KFormulaPartFactory : public KoFactory
 {
     Q_OBJECT
 public:
--- trunk/koffice/kformula/flake/CMakeLists.txt #687963:687964
@@ -45,6 +45,8 @@
 
 target_link_libraries(kformulalib  ${KDE4_KDEUI_LIBS} koguiutils)
 
+set_target_properties(kformulalib PROPERTIES VERSION ${GENERIC_KOFFICE_LIB_VERSION} \
SOVERSION ${GENERIC_KOFFICE_LIB_SOVERSION} ) +
 install(TARGETS kformulalib DESTINATION ${LIB_INSTALL_DIR})
 
 ########### FormulaShape Plugin ###############
--- trunk/koffice/kformula/flake/kformula_export.h #687963:687964
@@ -1,5 +1,5 @@
 /*  This file is part of the KDE project
-    Copyright (C) 2006 David Faure <faure@kde.org>
+    Copyright (C) 2007 David Faure <faure@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
@@ -17,17 +17,14 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef KOFORMULA_EXPORT_H
-#define KOFORMULA_EXPORT_H
+#ifndef KFORMULA_EXPORT_H
+#define KFORMULA_EXPORT_H
 
 /* needed for KDE_EXPORT and KDE_IMPORT macros */
 #include <kdemacros.h>
 
-/* We use _WIN32/_WIN64 instead of Q_OS_WIN so that this header can be used from C \
                files too */
-#if defined _WIN32 || defined _WIN64
-
 #ifndef KOFORMULA_EXPORT
-# if defined(MAKE_KOFORMULA_LIB)
+# if defined(MAKE_KFORMULALIB_LIB)
    /* We are building this library */ 
 #  define KOFORMULA_EXPORT KDE_EXPORT
 # else
@@ -36,27 +33,23 @@
 # endif
 #endif
 
-#else /* UNIX */
-
-#define KOFORMULA_EXPORT KDE_EXPORT
-
+#ifndef KFORMULAPRIVATE_EXPORT
+# if defined(MAKE_KFORMULAPRIVATE_LIB)
+   /* We are building this library */
+#  define KFORMULAPRIVATE_EXPORT KDE_EXPORT
+# else
+   /* We are using this library */
+#  define KFORMULAPRIVATE_EXPORT KDE_IMPORT
+# endif
 #endif
 
-/* Now the same for KOFORMULA_TEST_EXPORT, if compiling with unit tests enabled */
+# ifndef KOFORMULA_EXPORT_DEPRECATED
+#  define KOFORMULA_EXPORT_DEPRECATED KDE_DEPRECATED KOFORMULA_EXPORT
+# endif
 
-#ifdef COMPILING_TESTS
-#if defined _WIN32 || defined _WIN64
-# if defined( MAKE_KOFORMULA_LIB )
-#       define KOFORMULA_TEST_EXPORT KDE_EXPORT
-#   else
-#       define KOFORMULA_TEST_EXPORT KDE_IMPORT
-#   endif
-# else /* not windows */
-#   define KOFORMULA_TEST_EXPORT KDE_EXPORT
+# ifndef KFORMULAPRIVATE_EXPORT_DEPRECATED
+#  define KFORMULAPRIVATE_EXPORT_DEPRECATED KDE_DEPRECATED KFORMULAPRIVATE_EXPORT
 # endif
-#else /* not compiling tests */
-#   define KOFORMULA_TEST_EXPORT
-#endif
 
 
 #endif


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