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

List:       kde-commits
Subject:    kdesupport
From:       David Faure <faure () kde ! org>
Date:       2013-01-09 10:02:10
Message-ID: 20130109100210.94308AC86A () svn ! kde ! org
[Download RAW message or body]

SVN commit 1331514 by dfaure:

Enable compilation with Qt5. Skip cpptoxml though, needs porting.


 M  +9 -0      cpptoxml/CMakeLists.txt  
 M  +9 -1      qimageblitz/CMakeLists.txt  


--- trunk/kdesupport/cpptoxml/CMakeLists.txt #1331513:1331514
@@ -26,6 +26,14 @@
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY  ${CMAKE_BINARY_DIR}/bin) 
 
+find_package(Qt5Core QUIET)
+if (Qt5Core_FOUND)
+
+  message(STATUS "TODO: port cpptoxml to Qt5. Heavy usage of QAtomicPointer, whose \
API has changed.") +
+  # Skip cpptoxml for now
+
+else()
 find_package(Qt4 REQUIRED)
 set(QT_USE_QTCORE 1) 
 include(${QT_USE_FILE})
@@ -65,3 +73,4 @@
 
 install(TARGETS cpptoxml DESTINATION bin)
 
+endif()
--- trunk/kdesupport/qimageblitz/CMakeLists.txt #1331513:1331514
@@ -3,11 +3,19 @@
 cmake_minimum_required(VERSION 2.6.4)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules \
) +
+find_package(Qt5Core QUIET)
+if (Qt5Core_FOUND)
+  message(STATUS "Building with Qt5 support")
+  find_package(ECM 0.0.6 REQUIRED NO_MODULE)
+  set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_MODULE_PATH})
+  find_package(Qt5Transitional REQUIRED Core Gui)
+else()
 find_package(Qt4 REQUIRED)
 # properly set up compile flags (QT_DEBUG/QT_NO_DEBUG, ...)
 include(${QT_USE_FILE})
+endif()
 
-
 set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" )
 set(EXEC_INSTALL_PREFIX  ${CMAKE_INSTALL_PREFIX}       CACHE PATH  "Base directory \
for executables and libraries")  #


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