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

List:       kde-commits
Subject:    koffice
From:       Adam Pigg <adam () piggz ! co ! uk>
Date:       2010-02-28 22:27:33
Message-ID: 1267396053.824287.9144.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1097317 by piggz:

Hopefully this will fix builds for people who dont build kchart.
Havnt fully tested as my machine is taking ages to rebuild koffice, but it seems \
sane, if not, pls do whatever needed. This is a temp solution while we find something \
                better.
CCMAIL: koffice-devel@kde.org

 M  +2 -0      CMakeLists.txt  
 M  +4 -1      kexi/plugins/CMakeLists.txt  
 M  +6 -1      libs/CMakeLists.txt  


--- trunk/koffice/CMakeLists.txt #1097316:1097317
@@ -400,6 +400,8 @@
 endif (SHOULD_BUILD_KPLATO)
 
 if (SHOULD_BUILD_KCHART)
+    set (WITH_kchart true CACHE BOOL "" FORCE)
+    add_definitions(-DHAVE_KCHART)
     macro_optional_add_subdirectory(kchart)
 endif (SHOULD_BUILD_KCHART)
 
--- trunk/koffice/kexi/plugins/CMakeLists.txt #1097316:1097317
@@ -5,8 +5,11 @@
 add_subdirectory( forms )
 add_subdirectory( migration )
 add_subdirectory( importexport )
-add_subdirectory( reports )
 
+if (WITH_kchart)
+    add_subdirectory( reports )
+endif (WITH_kchart)
+
 if(SHOULD_BUILD_SCRIPTING)
     add_subdirectory(scripting)
 endif(SHOULD_BUILD_SCRIPTING)
--- trunk/koffice/libs/CMakeLists.txt #1097316:1097317
@@ -10,4 +10,9 @@
 endif (SHOULD_BUILD_SCRIPTING)
 add_subdirectory( kopageapp )
 add_subdirectory( koproperty ) # TODO move to independent place like kdesupport
-#add_subdirectory( koreport )
+
+#atm, koreport depends on kdchart.  this will hopefully
+#fix builds for people who dont build kchart
+if (WITH_kchart)
+    add_subdirectory( koreport )
+endif (WITH_kchart)
\ No newline at end of file


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