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

List:       kde-commits
Subject:    koffice
From:       Cyrille Berger <cyb () lepi ! org>
Date:       2006-10-28 21:30:15
Message-ID: 1162071015.936673.7146.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 599864 by berger:

move the check if krita is to be build up in top directory, to use the value of \
SHOULD_BUILD_KRITA in filters to know if we should build krita filters as well


 M  +14 -0     CMakeLists.txt  
 M  +0 -11     krita/CMakeLists.txt  


--- trunk/koffice/CMakeLists.txt #599863:599864
@@ -78,6 +78,20 @@
 	${CMAKE_SOURCE_DIR}/kdgantt/KDGanttXMLTools.cpp
 	)
 
+# check if build krita there to be able to test if we can build filters/krita
+set(REQUIRED_LCMS_VERSION 115)
+
+if(LCMS_FOUND AND NOT LCMS_VERSION LESS ${REQUIRED_LCMS_VERSION})
+    set(SHOULD_BUILD_KRITA TRUE)
+else(LCMS_FOUND AND NOT LCMS_VERSION LESS ${REQUIRED_LCMS_VERSION})
+        set(SHOULD_BUILD_KRITA FALSE)
+        message(STATUS  "krita requires LittleCMS 1.15 or greater. Krita will not be \
built.\n" +                        "   If you want to compile Krita you should \
install:\n" +                        "   lcms 1.15 or newer \
(http://www.littlecms.com/)") +endif(LCMS_FOUND AND NOT LCMS_VERSION LESS \
${REQUIRED_LCMS_VERSION}) +
+
+
 add_subdirectory(libs)
 MESSAGE(STATUS "Before koffice-2.0 disable compile of example subdir, not necessary \
for official release")  add_subdirectory(example)
--- trunk/koffice/krita/CMakeLists.txt #599863:599864
@@ -2,17 +2,6 @@
 
 macro_optional_find_package(Kunittest)
 
-set(REQUIRED_LCMS_VERSION 115)
-
-if(LCMS_FOUND AND NOT LCMS_VERSION LESS ${REQUIRED_LCMS_VERSION})
-    set(SHOULD_BUILD_KRITA TRUE)
-else(LCMS_FOUND AND NOT LCMS_VERSION LESS ${REQUIRED_LCMS_VERSION})
-	set(SHOULD_BUILD_KRITA FALSE)
-	message(STATUS  "krita requires LittleCMS 1.15 or greater. Krita will not be \
                built.\n"
-			"   If you want to compile Krita you should install:\n"
-			"   lcms 1.15 or newer (http://www.littlecms.com/)")
-endif(LCMS_FOUND AND NOT LCMS_VERSION LESS ${REQUIRED_LCMS_VERSION})
-
 if (SHOULD_BUILD_KRITA)
 
     macro_optional_find_package(OpenGL)


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