[Digikam-devel] 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?