[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdesdk
From: Jeremy Paul Whiting <jpwhiting () kde ! org>
Date: 2012-12-19 22:45:30
Message-ID: 20121219224530.8CF54AC73D () svn ! kde ! org
[Download RAW message or body]
SVN commit 1329172 by whiting:
Move documentation into application folders, make every application build standalone \
or as part of kdesdk checkout
M +17 -76 CMakeLists.txt
M +4 -0 cervisia/CMakeLists.txt
A cervisia/doc (directory)
M +1 -1 cervisia/doc/CMakeLists.txt
D cmake/modules (directory)
D doc (directory)
M +2 -1 kapptemplate/CMakeLists.txt
A kapptemplate/cmake (directory)
A kapptemplate/cmake/modules (directory)
A kapptemplate/cmake/modules/COPYING-CMAKE-SCRIPTS
A kapptemplate/cmake/modules/KAppTemplateMacro.cmake \
cmake/modules/KAppTemplateMacro.cmake#1328912 A kapptemplate/doc \
(directory) M +1 -1 kapptemplate/doc/CMakeLists.txt
M +1 -0 kcachegrind/CMakeLists.txt
A kcachegrind/doc (directory)
M +1 -1 kcachegrind/doc/CMakeLists.txt
M +10 -0 kioslave/CMakeLists.txt
A kioslave/cmake (directory)
A kioslave/cmake/modules (directory)
A kioslave/cmake/modules/COPYING-CMAKE-SCRIPTS
A kioslave/cmake/modules/FindSVN.cmake
M +23 -2 kmtrace/CMakeLists.txt
A kmtrace/doc (directory)
M +1 -1 kmtrace/doc/CMakeLists.txt
M +2 -4 kompare/CMakeLists.txt
A kompare/doc (directory)
M +1 -1 kompare/doc/CMakeLists.txt
M +5 -0 kpartloader/CMakeLists.txt
M +7 -0 kprofilemethod/CMakeLists.txt
M +9 -0 kstartperf/CMakeLists.txt
M +4 -0 kuiviewer/CMakeLists.txt
M +14 -0 lokalize/CMakeLists.txt
A lokalize/doc (directory)
M +1 -0 okteta/CMakeLists.txt
A okteta/doc (directory)
M +1 -1 okteta/doc/CMakeLists.txt
M +9 -0 poxml/CMakeLists.txt
A poxml/cmake (directory)
A poxml/cmake/modules (directory)
A poxml/cmake/modules/COPYING-CMAKE-SCRIPTS
A poxml/cmake/modules/FindAntlr2.cmake \
cmake/modules/FindAntlr2.cmake#1328912 A poxml/doc (directory)
M +1 -0 scripts/CMakeLists.txt
A scripts/doc (directory)
M +8 -0 strigi-analyzer/CMakeLists.txt
M +7 -0 thumbnailers/CMakeLists.txt
A thumbnailers/cmake (directory)
A thumbnailers/cmake/modules (directory)
A thumbnailers/cmake/modules/COPYING-CMAKE-SCRIPTS
A thumbnailers/cmake/modules/FindGettextPO.cmake \
cmake/modules/FindGettextPO.cmake#1328912 M +1 -0 umbrello/CMakeLists.txt
A umbrello/doc (directory)
M +1 -1 umbrello/doc/CMakeLists.txt
--- trunk/KDE/kdesdk/CMakeLists.txt #1329171:1329172
@@ -4,6 +4,7 @@
# needs at least "include(MacroLibrary)" before. But that would defeat the goal
# to only include the submodules here and do nothing else.
# So we create our own clone of macro_optional_add_subdirectory here,
+
# to continue support for everybody who does not have a complete checkout of
# the KDESDK module
@@ -29,86 +30,26 @@
ENDIF(EXISTS ${_fullPath}/CMakeLists.txt)
ENDMACRO (KDESDK_OPTIONAL_ADD_SUBDIRECTORY)
+
cmake_minimum_required(VERSION 2.6)
project(kdesdk)
# list of self-contained submodules
-kdesdk_optional_add_subdirectory(kapptemplate)
+kdesdk_optional_add_subdirectory(cervisia)
kdesdk_optional_add_subdirectory(dolphin-plugins)
+kdesdk_optional_add_subdirectory(kapptemplate)
+kdesdk_optional_add_subdirectory(kcachegrind)
+kdesdk_optional_add_subdirectory(kioslave)
+kdesdk_optional_add_subdirectory(kmtrace)
+kdesdk_optional_add_subdirectory(kompare)
+kdesdk_optional_add_subdirectory(kpartloader)
+kdesdk_optional_add_subdirectory(kprofilemethod)
+kdesdk_optional_add_subdirectory(kstartperf)
+kdesdk_optional_add_subdirectory(kuiviewer)
+kdesdk_optional_add_subdirectory(lokalize)
kdesdk_optional_add_subdirectory(okteta)
+kdesdk_optional_add_subdirectory(poxml)
+kdesdk_optional_add_subdirectory(scripts)
+kdesdk_optional_add_subdirectory(strigi-analyzer)
+kdesdk_optional_add_subdirectory(thumbnailers)
kdesdk_optional_add_subdirectory(umbrello)
-# 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
-
-set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules )
-
-
-# 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(HUNSPELL)
-macro_log_feature(HUNSPELL_FOUND "HUNSPELL" "Library used for stemming" \
"http://hunspell.sourceforge.net/" FALSE "" "Required to build \
Lokalize.")
-
-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})
-
-if(HUNSPELL_FOUND OR WIN32)
- macro_optional_add_subdirectory(lokalize)
-endif(HUNSPELL_FOUND OR WIN32)
-
-macro_optional_add_subdirectory(kpartloader)
-macro_optional_add_subdirectory(strigi-analyzer)
-macro_optional_add_subdirectory(kioslave)
-
-check_c_source_compiles("
-#include <stdlib.h>
-
-int main() {
-#ifndef __GLIBC__
- choke me
-#endif
- return 0;
-}" LIBC_IS_GLIBC)
-if (LIBC_IS_GLIBC)
- macro_optional_add_subdirectory(kmtrace)
-endif ()
-
-macro_optional_add_subdirectory(kompare)
-macro_optional_add_subdirectory(kprofilemethod)
-
-# By default in kde3 kstartpref was not compiled, but well, if it compiles...
-check_include_file(ltdl.h HAVE_LTDL_H)
-if(HAVE_LTDL_H AND NOT APPLE AND NOT WIN32)
- macro_optional_add_subdirectory(kstartperf)
-endif(HAVE_LTDL_H AND NOT APPLE AND NOT WIN32)
-
-macro_optional_add_subdirectory(kuiviewer)
-macro_optional_add_subdirectory(poxml)
-macro_optional_add_subdirectory(scripts)
-macro_optional_add_subdirectory(thumbnailers)
-
-macro_optional_add_subdirectory(doc)
-macro_display_feature_log()
--- trunk/KDE/kdesdk/cervisia/CMakeLists.txt #1329171:1329172
@@ -2,6 +2,7 @@
project(cervisia)
+if (UNIX)
find_package(KDE4 REQUIRED)
include(KDE4Defaults)
@@ -15,6 +16,7 @@
# TODO port away from QT3_SUPPORT
add_definitions(-DQT3_SUPPORT)
+add_subdirectory( doc )
add_subdirectory( cvsservice )
add_subdirectory( pics )
@@ -138,3 +140,5 @@
#cervisia.1.in: cervisia.pod
# pod2man --center "Cervisia" --release "${CERVISIA_VERSION}" \
# cervisia.pod > cervisia.1.in
+
+endif ()
--- trunk/KDE/kdesdk/cervisia/doc/CMakeLists.txt #1328912:1329172
@@ -1,2 +1,2 @@
########### install files ###############
-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en)
+kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR \
cervisia)
--- trunk/KDE/kdesdk/kapptemplate/CMakeLists.txt #1329171:1329172
@@ -2,7 +2,7 @@
project(kapptemplate)
-set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
+set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
# search packages used by KDE
find_package(KDE4 REQUIRED)
@@ -16,6 +16,7 @@
include(KAppTemplateMacro)
+add_subdirectory(doc)
add_subdirectory(icons)
add_subdirectory(templates)
add_subdirectory(tests)
--- trunk/KDE/kdesdk/kapptemplate/doc/CMakeLists.txt #1328912:1329172
@@ -1,3 +1,3 @@
########### install files ###############
#
-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en)
+kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR \
kapptemplate)
--- trunk/KDE/kdesdk/kcachegrind/CMakeLists.txt #1329171:1329172
@@ -29,6 +29,7 @@
)
ENDIF(NOT WIN32)
+add_subdirectory( doc )
add_subdirectory( libcore )
add_subdirectory( cgview )
add_subdirectory( libviews )
--- trunk/KDE/kdesdk/kcachegrind/doc/CMakeLists.txt #1328912:1329172
@@ -1,4 +1,4 @@
########### install files ###############
#
#
-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en)
+kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR \
kcachegrind)
--- trunk/KDE/kdesdk/kioslave/CMakeLists.txt #1329171:1329172
@@ -1,3 +1,13 @@
+cmake_minimum_required(VERSION 2.6)
+project(kioslave)
+set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules )
+
+# search packages used by KDE
+find_package(KDE4 REQUIRED)
+include(KDE4Defaults)
+include(MacroLibrary)
+include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
+
macro_optional_find_package(SVN)
macro_optional_find_package(Perl 5.10)
--- trunk/KDE/kdesdk/kmtrace/CMakeLists.txt #1329171:1329172
@@ -1,7 +1,26 @@
project(kmtrace)
+# search packages used by KDE
+find_package(KDE4 REQUIRED)
+include(KDE4Defaults)
+include(MacroLibrary)
+include(CheckIncludeFile)
+include(CheckIncludeFileCXX)
+include(CheckLibraryExists)
+include(CheckCSourceCompiles)
+
+check_c_source_compiles("
+#include <stdlib.h>
+
+int main() {
+#ifndef __GLIBC__
+ choke me
+#endif
+ return 0;
+}" LIBC_IS_GLIBC)
+
# Check if libiberty is available
find_library(LIBIBERTY_LIBRARY NAMES iberty)
-if (LIBIBERTY_LIBRARY)
+if (LIBIBERTY_LIBRARY AND LIBC_IS_GLIBC)
include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} \
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) \
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/kminspector.cmake \
${CMAKE_CURRENT_BINARY_DIR}/kminspector ) @@ -58,4 +77,6 @@
install( FILES kde.excludes DESTINATION ${DATA_INSTALL_DIR}/kmtrace )
install( FILES ktrace.h DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel )
-endif (LIBIBERTY_LIBRARY)
+add_subdirectory( doc )
+
+endif ()
--- trunk/KDE/kdesdk/kmtrace/doc/CMakeLists.txt #1328912:1329172
@@ -1 +1 @@
-kde4_create_manpage(man-demangle.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR})
+kde4_create_manpage(man-demangle.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR} \
SUBDIR kmtrace)
--- trunk/KDE/kdesdk/kompare/CMakeLists.txt #1329171:1329172
@@ -1,15 +1,13 @@
+cmake_minimum_required(VERSION 2.6)
project(kompare)
-# Allow for standalone build outside of KDE's kdesdk module
-if ("${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")
- cmake_minimum_required(VERSION 2.6)
# search packages used by KDE
find_package(KDE4 REQUIRED)
include(KDE4Defaults)
add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
-endif()
+add_subdirectory( doc )
add_subdirectory( interfaces )
add_subdirectory( libdiff2 )
add_subdirectory( libdialogpages )
--- trunk/KDE/kdesdk/kompare/doc/CMakeLists.txt #1328912:1329172
@@ -1,4 +1,4 @@
########### install files ###############
#
#
-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en)
+kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR \
kompare)
--- trunk/KDE/kdesdk/kpartloader/CMakeLists.txt #1329171:1329172
@@ -1,6 +1,11 @@
project(kpartloader)
########### kpartloader ###############
+find_package(KDE4 REQUIRED)
+include(KDE4Defaults)
+include(MacroLibrary)
+include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
+
set(kpartloader_SRCS
kpartloader.cpp
)
--- trunk/KDE/kdesdk/kprofilemethod/CMakeLists.txt #1329171:1329172
@@ -1 +1,8 @@
+project(kprofilemethod)
+
+find_package(KDE4 REQUIRED)
+include(KDE4Defaults)
+include(MacroLibrary)
+include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
+
install( FILES kprofilemethod.h DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel)
--- trunk/KDE/kdesdk/kstartperf/CMakeLists.txt #1329171:1329172
@@ -1,7 +1,15 @@
project(kstartperf)
+find_package(KDE4 REQUIRED)
+include(KDE4Defaults)
+include(MacroLibrary)
+include(CheckIncludeFile)
+include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
+# By default in kde3 kstartpref was not compiled, but well, if it compiles...
+check_include_file(ltdl.h HAVE_LTDL_H)
+if(HAVE_LTDL_H AND NOT APPLE AND NOT WIN32)
########### next target ###############
set(kstartperf_LIB_SRCS libkstartperf.c )
@@ -27,3 +35,4 @@
target_link_libraries(kstartperf_bin ${KDE4_KDECORE_LIBS})
install(TARGETS kstartperf_bin ${INSTALL_TARGETS_DEFAULT_ARGS} )
+endif()
--- trunk/KDE/kdesdk/kuiviewer/CMakeLists.txt #1329171:1329172
@@ -1,5 +1,9 @@
project(kuiviewer)
+find_package(KDE4 REQUIRED)
+include(KDE4Defaults)
+include(MacroLibrary)
+include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
########### next target ###############
--- trunk/KDE/kdesdk/lokalize/CMakeLists.txt #1329171:1329172
@@ -1,6 +1,20 @@
project(lokalize)
+# search packages used by KDE
+find_package(KDE4 REQUIRED)
+include(KDE4Defaults)
+include(MacroLibrary)
+
+add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
+
+macro_optional_find_package(HUNSPELL)
+macro_log_feature(HUNSPELL_FOUND "HUNSPELL" "Library used for stemming" \
"http://hunspell.sourceforge.net/" FALSE "" "Required to build Lokalize.") +
+if(HUNSPELL_FOUND OR WIN32)
+ include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
+ add_subdirectory(doc)
add_subdirectory(src)
add_subdirectory(scripts)
add_subdirectory(icons)
+endif()
#add_subdirectory(strigi-analyzer)
--- trunk/KDE/kdesdk/okteta/CMakeLists.txt #1329171:1329172
@@ -62,6 +62,7 @@
# helper libs
add_subdirectory( libs )
+add_subdirectory( doc )
set( OKTETALIBS_MAJOR_VERSION 0 )
set( OKTETALIBS_MINOR_VERSION 8 )
--- trunk/KDE/kdesdk/okteta/doc/CMakeLists.txt #1328912:1329172
@@ -1 +1 @@
-kde4_create_handbook( index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en )
+kde4_create_handbook( index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en \
SUBDIR okteta)
--- trunk/KDE/kdesdk/poxml/CMakeLists.txt #1329171:1329172
@@ -1,5 +1,13 @@
project(poxml)
+# search packages used by KDE
+find_package(KDE4 REQUIRED)
+include(KDE4Defaults)
+add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
+include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} \
${KDEPIMLIBS_INCLUDE_DIR}) +
+set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules )
+
set(HAVE_ANTLR FALSE)
macro_optional_find_package(Antlr2)
@@ -8,6 +16,7 @@
endif (ANTLR2_FOUND AND ANTLR2_EXECUTABLE)
macro_log_feature(HAVE_ANTLR "Antlr" "Language tool for constructing recognizers, \
compilers, etc" "http://www.antlr2.org/" FALSE "2.x" "Used for the po2xml and swappo \
tools.")
+add_subdirectory( doc )
########### next target ###############
set(split2po_SRCS split.cpp parser.cpp)
--- trunk/KDE/kdesdk/scripts/CMakeLists.txt #1329171:1329172
@@ -17,6 +17,7 @@
########### install files ###############
if (UNIX)
#shell program
+add_subdirectory( doc )
install(PROGRAMS
adddebug
build-progress.sh
--- trunk/KDE/kdesdk/strigi-analyzer/CMakeLists.txt #1329171:1329172
@@ -1,4 +1,12 @@
+project(strigi-analyzer)
+find_package(KDE4 REQUIRED)
+include(KDE4Defaults)
+include(MacroLibrary)
+include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
+
+find_package(Strigi REQUIRED)
+
add_subdirectory( diff )
add_subdirectory( ts )
add_subdirectory( po )
--- trunk/KDE/kdesdk/thumbnailers/CMakeLists.txt #1329171:1329172
@@ -1,3 +1,10 @@
+project(thumbnailers)
+
+find_package(KDE4 REQUIRED)
+include(KDE4Defaults)
+
+set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules )
+
macro_optional_find_package(GettextPO)
macro_log_feature(GETTEXTPO_FOUND "gettext-po" "A library for processing PO files" \
"www.gnu.org/software/gettext" FALSE "" "Required to build the PO thumbnailer")
--- trunk/KDE/kdesdk/umbrello/CMakeLists.txt #1329171:1329172
@@ -40,4 +40,5 @@
if(LIBXSLT_FOUND AND LIBXML2_FOUND AND Boost_FOUND)
add_subdirectory( umbrello )
+ add_subdirectory( doc )
endif(LIBXSLT_FOUND AND LIBXML2_FOUND AND Boost_FOUND)
--- trunk/KDE/kdesdk/umbrello/doc/CMakeLists.txt #1328912:1329172
@@ -1,2 +1,2 @@
########### install files ###############
-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en)
+kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR \
umbrello)
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic