[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdesdk
From: Andi Fischer <andi.fischer () hispeed ! ch>
Date: 2012-06-02 9:54:30
Message-ID: 20120602095430.E523DAC76E () svn ! kde ! org
[Download RAW message or body]
SVN commit 1297809 by fischer:
Make Umbrello submodule self-contained, in preparation of git migration.
CCMAIL:kde-sdk-devel@kde.org
M +1 -13 CMakeLists.txt
D umbrello/CMakeLists-StandaloneIncl.txt
M +36 -3 umbrello/CMakeLists.txt
--- trunk/KDE/kdesdk/CMakeLists.txt #1297808:1297809
@@ -31,6 +31,7 @@
# list of self-contained submodules
kdesdk_optional_add_subdirectory(okteta)
+kdesdk_optional_add_subdirectory(umbrello)
# kcachegrind is usable on Windows for XDebug etc.
kdesdk_optional_add_subdirectory(kcachegrind)
@@ -60,15 +61,6 @@
find_package(Strigi REQUIRED)
-macro_optional_find_package(LibXslt)
-macro_log_feature(LIBXSLT_FOUND "LibXSLT" "A library to transform XMLfiles into \
other XML files" "http://xmlsoft.org/XSLT" FALSE "" "Required to \
build Umbrello.")
-macro_optional_find_package(LibXml2)
-macro_log_feature(LIBXML2_FOUND "LibXML2" "Libraries used to develop XML \
applications" "http://xmlsoft.org" FALSE "" "Required to build \
Umbrello.")
-
-set(Boost_MINIMUM_VERSION 1.33.1)
-macro_optional_find_package(Boost)
-macro_log_feature(Boost_FOUND "boost" "Boost C++ Libraries" "http://www.boost.org" \
FALSE "1.33.1" "Required to build Umbrello.")
-
macro_optional_find_package(HUNSPELL)
macro_log_feature(HUNSPELL_FOUND "HUNSPELL" "Library used for stemming" \
"http://hunspell.sourceforge.net/" FALSE "" "Required to build Lokalize.")
@@ -126,9 +118,5 @@
macro_optional_add_subdirectory(scripts)
macro_optional_add_subdirectory(thumbnailers)
-if(LIBXSLT_FOUND AND LIBXML2_FOUND AND Boost_FOUND)
- macro_optional_add_subdirectory(umbrello)
-endif(LIBXSLT_FOUND AND LIBXML2_FOUND AND Boost_FOUND)
-
macro_optional_add_subdirectory(doc)
macro_display_feature_log()
--- trunk/KDE/kdesdk/umbrello/CMakeLists.txt #1297808:1297809
@@ -2,10 +2,43 @@
cmake_minimum_required(VERSION 2.8)
-# kde4_no_enable_final( umbrello )
+set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
-# enable the next line for compiling without kdesdk (standalone)
-#INCLUDE(CMakeLists-StandaloneIncl.txt OPTIONAL)
+# search packages used by KDE
+find_package(KDE4 REQUIRED)
+include(KDE4Defaults)
+include(MacroLibrary)
+include(CheckIncludeFile)
+include(CheckIncludeFileCXX)
+include(CheckLibraryExists)
+include(CheckCSourceCompiles)
+macro_optional_find_package(KdepimLibs)
+
+# The FindKDE4.cmake module sets _KDE4_PLATFORM_DEFINITIONS with
+# definitions like _GNU_SOURCE that are needed on each platform.
+set(CMAKE_REQUIRED_DEFINITIONS ${_KDE4_PLATFORM_DEFINITIONS} -DQT_STRICT_ITERATORS)
+
+find_package(Strigi REQUIRED)
+
+macro_optional_find_package(LibXslt)
+macro_log_feature(LIBXSLT_FOUND "LibXSLT" "A library to transform XMLfiles into \
other XML files" "http://xmlsoft.org/XSLT" FALSE "" "Required to build Umbrello.") \
+macro_optional_find_package(LibXml2) +macro_log_feature(LIBXML2_FOUND "LibXML2" \
"Libraries used to develop XML applications" "http://xmlsoft.org" FALSE "" "Required \
to build Umbrello.") +
+set(Boost_MINIMUM_VERSION 1.33.1)
+macro_optional_find_package(Boost)
+macro_log_feature(Boost_FOUND "boost" "Boost C++ Libraries" "http://www.boost.org" \
FALSE "1.33.1" "Required to build Umbrello.") +
+add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
+include_directories(
+ ${CMAKE_SOURCE_DIR}
+ ${CMAKE_BINARY_DIR}
+ ${KDE4_INCLUDES}
+ ${KDEPIMLIBS_INCLUDE_DIR}
+)
+
+macro_display_feature_log()
+
add_subdirectory( umbrello )
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic