[Kde-extra-gear] Dependencies problem with digikam

[Kleag]

Great ! Thanks :-)

Kleag
On Saturday 23 June 2007 14:36:43 Gilles Caulier wrote:
> Fixed today by Laurent Montel:
>
> SVN commit 679234 by mlaurent:
>
> Don't break compile of all extragear/digikam when module required
> by digikam is not found
>
>
>  M  +17 -1     CMakeLists.txt
>  M  +0 -13     digikam/CMakeLists.txt
>
>
> --- trunk/extragear/graphics/CMakeLists.txt #679233:679234
> @@ -12,6 +12,19 @@
>  macro_optional_find_package(Freetype)
>  macro_optional_find_package(IMLIB)
>
> +# For digikam
> +macro_optional_find_package(LCMS)
> +macro_optional_find_package(JPEG)
> +macro_optional_find_package(PNG)
> +macro_optional_find_package(TIFF)
> +macro_optional_find_package(Gphoto2)
> +macro_optional_find_package(Jasper)
> +macro_optional_find_package(Sqlite)
> +macro_optional_find_package(Kdcraw)
> +macro_optional_find_package(Kexiv2)
> +macro_optional_find_package(Kipi)
> +
> +
>  MACRO_LOG_FEATURE(OPENGL_FOUND "libopengl" "OpenGL lib is needed to build
> the kpovmodeler project" "http://www.X.org/ <http://www.x.org/>" FALSE ""
> "")
>  MACRO_LOG_FEATURE(FREETYPE_FOUND "libfreetype" "FreeType lib is needed to
> build the kpovmodeler project" "http://freetype.sf.net" FALSE "" "")
>  MACRO_LOG_FEATURE(IMLIB_FOUND "imlib" "imlib is needed to build kuickshow
> project" "http://freshmeat.net/projects/imlib/" FALSE "" "")
> @@ -26,8 +39,11 @@
>  macro_optional_add_subdirectory(kgrab)
>  macro_optional_add_subdirectory(kgraphviewer)
>  macro_optional_add_subdirectory(kiconedit)
> -macro_optional_add_subdirectory(digikam)
>
> +if(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND
> GPHOTO2_FOUND AND JASPER_FOUND AND SQLITE_FOUND AND KDCRAW_FOUND AND
> KEXIV2_FOUND AND KIPI_FOUND)
> +  macro_optional_add_subdirectory(digikam)
> +endif(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND
> GPHOTO2_FOUND AND JASPER_FOUND AND SQLITE_FOUND AND KDCRAW_FOUND AND
> KEXIV2_FOUND AND KIPI_FOUND)
> +
>  if(OPENGL_FOUND AND OPENGL_GLU_FOUND AND FREETYPE_FOUND)
>    macro_optional_add_subdirectory(kpovmodeler)
>  endif(OPENGL_FOUND AND OPENGL_GLU_FOUND AND FREETYPE_FOUND)
> --- trunk/extragear/graphics/digikam/CMakeLists.txt #679233:679234
> @@ -1,18 +1,5 @@
>  PROJECT(digikam)
>
> -FIND_PACKAGE(KDE4 REQUIRED)
> -FIND_PACKAGE(LCMS REQUIRED)
> -FIND_PACKAGE(JPEG REQUIRED)
> -FIND_PACKAGE(PNG REQUIRED)
> -FIND_PACKAGE(TIFF REQUIRED)
> -FIND_PACKAGE(Gphoto2 REQUIRED)
> -FIND_PACKAGE(Jasper REQUIRED)
> -FIND_PACKAGE(Sqlite REQUIRED)
> -FIND_PACKAGE(Kdcraw REQUIRED)
> -FIND_PACKAGE(Kexiv2 REQUIRED)
> -FIND_PACKAGE(Kipi REQUIRED)
> -
> -
>  ADD_DEFINITIONS(${QT_DEFINITIONS}
>                 ${KDE4_DEFINITIONS}
>                 ${KDCRAW_DEFINITIONS}
>
> Gilles Caulier
>
> 2007/6/21, Kleag <kleag at free.fr>:
> > Hello,
> >
> > It seems that there is a dependency problem in extragear-graphics since
> > the
> > addition of digikam: now cmake fail for kraphviewer if any digikam
> > dependency
> > is not fullfilled. I'm not sure how this should be corrected (move the
> > digikam FIND_PACKAGEs to a extragear-graphics macro_optional_find_package
> > and
> > add a if ... around the macro_optional_add_subdirectory of digikam ???),
> > so I
> > let that to people better than me at cmake.
> >
> > Best regards,
> >
> > Kleag
> > --
> > KsirK - a turn-based strategy game for KDE
> > http://gna.org/projects/ksirk
> >
> > KGraphViewer - a GraphViz dot graphs viewer
> > http://extragear.kde.org/apps/kgraphviewer
> > _______________________________________________
> > Kde-extra-gear mailing list
> > Kde-extra-gear at kde.org
> > https://mail.kde.org/mailman/listinfo/kde-extra-gear