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

List:       kde-commits
Subject:    KDE/kdegraphics
From:       Albert Astals Cid <tsdgeos () terra ! es>
Date:       2010-10-13 22:09:22
Message-ID: 20101013220922.89D62AC895 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1185619 by aacid:

Do not die at cmake time if lcms is not found
CCMAIL: caulier.gilles@gmail.com


 M  +3 -0      CMakeLists.txt  
 M  +2 -0      libs/CMakeLists.txt  
 M  +2 -2      thumbnailers/CMakeLists.txt  


--- trunk/KDE/kdegraphics/CMakeLists.txt #1185618:1185619
@@ -24,6 +24,9 @@
 macro_optional_find_package(Sane)
 macro_log_feature(SANE_FOUND "SANE" "SANE libraries which are needed by applications \
that want to access scanners." "http://www.sane-project.org" FALSE "" "Provides \
scanning support for libksane and ksaneplugin.")  
+macro_optional_find_package(LCMS)
+macro_log_feature(LCMS_FOUND "Little CMS" "Color Management library" \
"http://www.littlecms.com/" FALSE "" "Required to build libkdcraw and raw \
thumbnailer") +
 if(X11_FOUND)
   #X11_xf86vmode discovery is done by FindX11
   macro_log_feature(X11_xf86vmode_FOUND "X11 Video Mode Extension (xf86vm)" "An X11 \
extension providing access to detailed timings of video modes currently in use, and a \
means to modify them" "http://www.x.org" FALSE "" "X11 xvidmode extensions are needed \
                to build kgamma.")
--- trunk/KDE/kdegraphics/libs/CMakeLists.txt #1185618:1185619
@@ -1,5 +1,7 @@
 add_subdirectory(libkipi)
+if (LCMS_FOUND)
 add_subdirectory(libkdcraw)
+endif (LCMS_FOUND)
 add_subdirectory(libkexiv2)
 if (WIN32 OR SANE_FOUND)
     add_subdirectory(libksane)
--- trunk/KDE/kdegraphics/thumbnailers/CMakeLists.txt #1185618:1185619
@@ -1,6 +1,6 @@
 macro_optional_add_subdirectory(ps)
 add_subdirectory(mobi)
 
-if(EXIV2_FOUND)
+if(EXIV2_FOUND AND LCMS_FOUND)
 macro_optional_add_subdirectory(raw)
-endif(EXIV2_FOUND)
+endif(EXIV2_FOUND AND LCMS_FOUND)


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