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

List:       koffice-devel
Subject:    Re: Problem building tests
From:       Brad Hards <bradh () frogmouth ! net>
Date:       2008-01-06 2:09:51
Message-ID: 200801061309.56222.bradh () frogmouth ! net
[Download RAW message or body]

[Attachment #2 (multipart/signed)]


On Sunday 06 January 2008 12:04:53 pm Brad Hards wrote:
> On Sunday 06 January 2008 10:35:21 am Brad Hards wrote:
> > I'm not seeing why this is occuring. The KPrShapeAnimations are in
> > libkpresenterprivate, I only appear to have one libkpresenterprivate,
> > the export looks OK.
>
> Actually, I now think the export is screwy. It probably worked really well
> when there was an explicit cmake flag to turn on building tests, but the
> current code isn't really compatible with that approach.
>
> #ifdef COMPILING_TESTS
> #if defined _WIN32 || defined _WIN64
> # if defined(MAKE_KPRESENTERPRIVATE_LIB)
> #       define KPRESENTER_TEST_EXPORT KDE_EXPORT
> #   else
> #       define KPRESENTER_TEST_EXPORT KDE_IMPORT
> #   endif
> # else /* not windows */
> #   define KPRESENTER_TEST_EXPORT KDE_EXPORT
> # endif
> #else /* not compiling tests */
> #   define KPRESENTER_TEST_EXPORT
> #endif
>
> I think that the problem is that COMPILING_TESTS might be set by "make
> buildtests", but it is too late by then (since the library -
> kpresenterprivate or kwordprivate - is already built without KDE_EXPORT)
>
> Changing the FOO_TEST_EXPORT to FOO_EXPORT  in a couple of places is enough
> to get those tests to build, however maybe changing the foo_export.h
> headers would be better? I'm not especially happy with either option, but
> the only other approach is not to allow "make buildtests"
>
> Index: kword/part/KWCanvas.h
> ===================================================================
> --- kword/part/KWCanvas.h       (revision 757799)
> +++ kword/part/KWCanvas.h       (working copy)
> @@ -40,7 +40,7 @@
>   * the screen as well as the interaction with the user via mouse
>   * and keyboard. There is one per view.
>   */
> -class KWORD_TEST_EXPORT KWCanvas : public QWidget, public KoCanvasBase {
> +class KWORD_EXPORT KWCanvas : public QWidget, public KoCanvasBase {
>      Q_OBJECT
>
>  public:
> Index: kpresenter/part/shapeanimations/KPrShapeAnimation.h
> ===================================================================
> --- kpresenter/part/shapeanimations/KPrShapeAnimation.h (revision 757799)
> +++ kpresenter/part/shapeanimations/KPrShapeAnimation.h (working copy)
> @@ -44,7 +44,7 @@
>   * The state of the animation is kept in the animationData and is
>   * passed to the ainmation when it is run e.g. on a special view.
>   */
> -class KPRESENTER_TEST_EXPORT KPrShapeAnimation
> +class KPRESENTER_EXPORT KPrShapeAnimation
>  {
>  public:
>      enum Type
Err, and this one:
--- kpresenter/part/KPrShapeAnimations.h        (revision 757799)
+++ kpresenter/part/KPrShapeAnimations.h        (working copy)
@@ -53,7 +53,7 @@

 typedef boost::multi_index::nth_index<ShapeAnimations,1>::type 
ShapeAnimationsByStep;

-class KPRESENTER_TEST_EXPORT KPrShapeAnimations
+class KPRESENTER_EXPORT KPrShapeAnimations
 {
 public:
     KPrShapeAnimations();

["signature.asc" (application/pgp-signature)]

_______________________________________________
koffice-devel mailing list
koffice-devel@kde.org
https://mail.kde.org/mailman/listinfo/koffice-devel


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