digikam doesn't build... patch

classic Classic list List threaded Threaded
5 messages Options
Reply | Threaded
Open this post in threaded view
|

digikam doesn't build... patch

Matthew Woehlke
(Please CC me on replies.)

A handful of files are unable to find config-digikam.h, which is in
CMAKE_BINARY_DIR. There is no -I being added for this directory.

Do I miss something? Or may I commit the following patch which fixes this?

Index: extragear/graphics/digikam/CMakeLists.txt
===================================================================
--- CMakeLists.txt      (revision 1007995)
+++ CMakeLists.txt      (working copy)
@@ -400,6 +400,7 @@
                          ${GPHOTO2_INCLUDE_DIRS}
                          ${SOPRANO_INCLUDE_DIR}
                          ${NEPOMUK_INCLUDE_DIR}
+                        ${CMAKE_CURRENT_BINARY_DIR}
                          ${CMAKE_CURRENT_SOURCE_DIR}/digikam
                          ${CMAKE_CURRENT_BINARY_DIR}/digikam
                         )
===================================================================

--
Matthew
Please do not quote my e-mail address unobfuscated in message bodies.
--
Thank you for reading all the way to this .sig. You may stop reading
now. Really. It is safe to stop. There is no more content. Why are you
still reading?

_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel
Reply | Threaded
Open this post in threaded view
|

Re: digikam doesn't build... patch

Bugzilla from andi.clemens@gmx.net
Works fine here, otherwise we devs would have noticed this already ;-)
From where are you building digiKam? extragear?
If so, I don't know if this is working, I normally build from within
extragear/graphics or extragear/graphics/digikam.

Marcel,
what do you think?

Andi

On Thursday 06 August 2009 23:49:42 Matthew Woehlke wrote:

> (Please CC me on replies.)
>
> A handful of files are unable to find config-digikam.h, which is in
> CMAKE_BINARY_DIR. There is no -I being added for this directory.
>
> Do I miss something? Or may I commit the following patch which fixes this?
>
> Index: extragear/graphics/digikam/CMakeLists.txt
> ===================================================================
> --- CMakeLists.txt      (revision 1007995)
> +++ CMakeLists.txt      (working copy)
> @@ -400,6 +400,7 @@
>                           ${GPHOTO2_INCLUDE_DIRS}
>                           ${SOPRANO_INCLUDE_DIR}
>                           ${NEPOMUK_INCLUDE_DIR}
> +                        ${CMAKE_CURRENT_BINARY_DIR}
>                           ${CMAKE_CURRENT_SOURCE_DIR}/digikam
>                           ${CMAKE_CURRENT_BINARY_DIR}/digikam
>                          )
> ===================================================================
_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel
Reply | Threaded
Open this post in threaded view
|

Re: digikam doesn't build... patch

Marcel Wiesweg
Am Freitag, 7. August 2009 schrieb Andi Clemens:
> Works fine here, otherwise we devs would have noticed this already ;-)
>
> >From where are you building digiKam? extragear?
>
> If so, I don't know if this is working, I normally build from within
> extragear/graphics or extragear/graphics/digikam.
>
> Marcel,
> what do you think?

There is this line in digikam/digikam/CMakeLists.txt:65:
                     # config-digikam.h
                     ${CMAKE_CURRENT_BINARY_DIR}/../

Don't know why it's not working in some situations. I would guess moving it up
to digikam/CMakeLists.txt is not much of a difference. If it fixes things for
you...

Marcel
_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel
Reply | Threaded
Open this post in threaded view
|

Re: digikam doesn't build... patch

Matthew Woehlke
Marcel Wiesweg wrote:
> Am Freitag, 7. August 2009 schrieb Andi Clemens:
>> Works fine here, otherwise we devs would have noticed this already ;-)

Indeed, it seems I've had this problem some time, which does make me
wonder why I am special...

Oh, I see. It's because I actually build the tests :P. The problems are
coming from test/, specifically:

/usr/local/src/kde/svn/trunk/digikam/tests/cameranamehelpertest.h:33:28:
error: config-digikam.h: No such file or directory
/usr/local/src/kde/svn/trunk/digikam/utilities/cameragui/gpcamera.cpp:50:28:
error: config-digikam.h: No such file or directory
/usr/local/src/kde/svn/trunk/digikam/digikam/albumsettings.cpp:50:28:
error: config-digikam.h: No such file or directory

(The tests compiling source files from other places is what initially
threw me off.)

> There is this line in digikam/digikam/CMakeLists.txt:65:
>                      # config-digikam.h
>                      ${CMAKE_CURRENT_BINARY_DIR}/../
>
> Don't know why it's not working in some situations. I would guess moving it up
> to digikam/CMakeLists.txt is not much of a difference. If it fixes things for
> you...

It works for digikam/digikam/... obviously it doesn't do much good for
digikam/tests/ :-).

I checked this in instead (spacing adjusted in mail to prevent
wrapping), as being the obvious fix at this point.

Index: tests/CMakeLists.txt
===================================================================
--- tests/CMakeLists.txt        (revision 1007995)
+++ tests/CMakeLists.txt        (working copy)
@@ -13,6 +13,7 @@
                ${CMAKE_CURRENT_SOURCE_DIR}/../imageplugins/freerotation
                ${CMAKE_CURRENT_SOURCE_DIR}/../digikam
                ${CMAKE_CURRENT_SOURCE_DIR}/..
+              ${CMAKE_CURRENT_BINARY_DIR}/..
                ${GPHOTO2_INCLUDE_DIRS}
  )

===================================================================

--
Matthew
Please do not quote my e-mail address unobfuscated in message bodies.
--
Thank you for reading all the way to this .sig. You may stop reading
now. Really. It is safe to stop. There is no more content. Why are you
still reading?

_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel
Reply | Threaded
Open this post in threaded view
|

Re: digikam doesn't build... patch

Bugzilla from andi.clemens@gmx.net
I build the tests every day, works fine here. Strange...

Andi

On Friday 07 August 2009 17:39:29 Matthew Woehlke wrote:

> Marcel Wiesweg wrote:
> > Am Freitag, 7. August 2009 schrieb Andi Clemens:
> >> Works fine here, otherwise we devs would have noticed this already ;-)
>
> Indeed, it seems I've had this problem some time, which does make me
> wonder why I am special...
>
> Oh, I see. It's because I actually build the tests :P. The problems are
> coming from test/, specifically:
>
> /usr/local/src/kde/svn/trunk/digikam/tests/cameranamehelpertest.h:33:28:
> error: config-digikam.h: No such file or directory
> /usr/local/src/kde/svn/trunk/digikam/utilities/cameragui/gpcamera.cpp:50:28
>: error: config-digikam.h: No such file or directory
> /usr/local/src/kde/svn/trunk/digikam/digikam/albumsettings.cpp:50:28:
> error: config-digikam.h: No such file or directory
>
> (The tests compiling source files from other places is what initially
> threw me off.)
>
> > There is this line in digikam/digikam/CMakeLists.txt:65:
> >                      # config-digikam.h
> >                      ${CMAKE_CURRENT_BINARY_DIR}/../
> >
> > Don't know why it's not working in some situations. I would guess moving
> > it up to digikam/CMakeLists.txt is not much of a difference. If it fixes
> > things for you...
>
> It works for digikam/digikam/... obviously it doesn't do much good for
> digikam/tests/ :-).
>
> I checked this in instead (spacing adjusted in mail to prevent
> wrapping), as being the obvious fix at this point.
>
> Index: tests/CMakeLists.txt
> ===================================================================
> --- tests/CMakeLists.txt        (revision 1007995)
> +++ tests/CMakeLists.txt        (working copy)
> @@ -13,6 +13,7 @@
>                 ${CMAKE_CURRENT_SOURCE_DIR}/../imageplugins/freerotation
>                 ${CMAKE_CURRENT_SOURCE_DIR}/../digikam
>                 ${CMAKE_CURRENT_SOURCE_DIR}/..
> +              ${CMAKE_CURRENT_BINARY_DIR}/..
>                 ${GPHOTO2_INCLUDE_DIRS}
>   )
>
> ===================================================================
_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel