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

List:       kde-commits
Subject:    KDE/kdesdk
From:       André Wöbbeking <woebbeking () kde ! org>
Date:       2012-06-07 22:20:33
Message-ID: 20120607222033.31427AC76E () svn ! kde ! org
[Download RAW message or body]

SVN commit 1298931 by woebbe:

Make Cervisia submodule self-contained, in prepartion of git migration

CCMAIL:kde-sdk-devel@kde.org


 M  +3 -3      CMakeLists.txt  
 M  +12 -0     cervisia/CMakeLists.txt  


--- trunk/KDE/kdesdk/CMakeLists.txt #1298930:1298931
@@ -37,6 +37,9 @@
 # kcachegrind is usable on Windows for XDebug etc.
 kdesdk_optional_add_subdirectory(kcachegrind)
 
+if( UNIX )
+  kdesdk_optional_add_subdirectory(cervisia)
+endif( UNIX )
 
 ############################
 # START OF OLD MODULE SETUP
@@ -71,9 +74,6 @@
 
 include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${KDEPIMLIBS_INCLUDE_DIR})
 
-if( UNIX )
-  macro_optional_add_subdirectory(cervisia)
-endif( UNIX )
 if(HUNSPELL_FOUND OR WIN32)
   macro_optional_add_subdirectory(lokalize)
 endif(HUNSPELL_FOUND OR WIN32)
--- trunk/KDE/kdesdk/cervisia/CMakeLists.txt #1298930:1298931
@@ -1,5 +1,17 @@
+cmake_minimum_required(VERSION 2.6)
+
 project(cervisia)
 
+find_package(KDE4 REQUIRED)
+include(KDE4Defaults)
+
+add_definitions( ${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
+include_directories(
+    ${CMAKE_SOURCE_DIR}
+    ${CMAKE_BINARY_DIR}
+    ${KDE4_INCLUDES}
+)
+
 # TODO port away from QT3_SUPPORT
 add_definitions(-DQT3_SUPPORT)
 
[prev in list] [next in list] [prev in thread] [next in thread]