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

List:       koffice-devel
Subject:    koffice
From:       Cyrille Berger <cyb () lepi ! org>
Date:       2010-03-29 16:27:58
Message-ID: 20100329162758.4EDF9AC883 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1108710 by berger:

* bump soversion to 7
* as agreed, minimum Qt version for koffice is now Qt4.6, there is an
overide option: cmake -DFORCE_COMPILATION_WITH_QT45=ON will allow
compilation of KOffice with Qt4.5

CCMAIL:koffice-devel@kde.org



 M  +11 -4     CMakeLists.txt  


--- trunk/koffice/CMakeLists.txt #1108709:1108710
@@ -16,8 +16,8 @@
 
 # define the generic version of the KOffice libraries here
 # this makes it easy to advance it when the next KOffice release comes
-set(GENERIC_KOFFICE_LIB_VERSION "6.0.0")
-set(GENERIC_KOFFICE_LIB_SOVERSION "6")
+set(GENERIC_KOFFICE_LIB_VERSION "7.0.0")
+set(GENERIC_KOFFICE_LIB_SOVERSION "7")
 
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules )
 
@@ -75,10 +75,17 @@
 ## Look for KDE and Qt ##
 #########################
 ########################
-set(KDE_MIN_VERSION "4.1.0")
+set(KDE_MIN_VERSION "4.3.0")
 find_package(KDE4 4.3.0 REQUIRED)
-find_package(Qt4 4.5.0 REQUIRED)
 
+option(FORCE_COMPILATION_WITH_QT45 "This option force KOffice to accept compilation \
with Qt4.5, but note that this is not supported by KOffice team" OFF) +
+if(FORCE_COMPILATION_WITH_QT45)
+  find_package(Qt4 4.5.0 REQUIRED)
+else(FORCE_COMPILATION_WITH_QT45)
+  find_package(Qt4 4.6.0 REQUIRED)
+endif(FORCE_COMPILATION_WITH_QT45)
+
 include(KDE4Defaults)
 include(MacroLibrary)
 include (MacroAdditionalCleanFiles)
_______________________________________________
koffice-devel mailing list
koffice-devel@kde.org
https://mail.kde.org/mailman/listinfo/koffice-devel


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