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

List:       kde-commits
Subject:    KDE/kdesdk
From:       Friedrich W. H. Kossebau <kossebau () kde ! org>
Date:       2012-06-04 23:37:09
Message-ID: 20120604233709.CAB6BAC76E () svn ! kde ! org
[Download RAW message or body]

SVN commit 1298357 by kossebau:

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

okay'ed by Anne-Marie


 M  +1 -1      CMakeLists.txt  
 M  +14 -0     kapptemplate/CMakeLists.txt  
 A             kapptemplate/COPYING   COPYING#1297796


--- trunk/KDE/kdesdk/CMakeLists.txt #1298356:1298357
@@ -30,6 +30,7 @@
 ENDMACRO (KDESDK_OPTIONAL_ADD_SUBDIRECTORY)
 
 # list of self-contained submodules
+kdesdk_optional_add_subdirectory(kapptemplate)
 kdesdk_optional_add_subdirectory(dolphin-plugins)
 kdesdk_optional_add_subdirectory(okteta)
 kdesdk_optional_add_subdirectory(umbrello)
@@ -77,7 +78,6 @@
   macro_optional_add_subdirectory(lokalize)
 endif(HUNSPELL_FOUND OR WIN32)
 
-macro_optional_add_subdirectory(kapptemplate)
 macro_optional_add_subdirectory(kpartloader)
 macro_optional_add_subdirectory(strigi-analyzer)
 macro_optional_add_subdirectory(kioslave)
--- trunk/KDE/kdesdk/kapptemplate/CMakeLists.txt #1298356:1298357
@@ -1,3 +1,5 @@
+cmake_minimum_required(VERSION 2.6)
+
 project(kapptemplate)
 
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
@@ -2,2 +4,12 @@
 
+# search packages used by KDE
+find_package(KDE4 REQUIRED)
+include(KDE4Defaults)
+include(MacroLibrary)
+
+add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
+add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
+
+include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} \
${KDEPIMLIBS_INCLUDE_DIR}) +
 include(KAppTemplateMacro)
@@ -46,3 +58,5 @@
 install(FILES templates/C++/akonadiserializer/akonadi-serializer.png DESTINATION \
${DATA_INSTALL_DIR}/kdevappwizard/template_previews)  install(FILES \
templates/C++/runner/runner.png DESTINATION \
${DATA_INSTALL_DIR}/kdevappwizard/template_previews)  install(FILES \
templates/C++/konqplugin/konqplugin.png DESTINATION \
${DATA_INSTALL_DIR}/kdevappwizard/template_previews) +
+macro_display_feature_log()


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