[kde-edu]: [patch] build applications standalone
Niko Sams
niko.sams at gmail.com
Wed Dec 22 21:12:09 CET 2010
Hi,
Attached is a patch that makes most kdeedu applications build
standalone (without top-level
CMakeLists.txt)
Maybe libkdeedu should be split even more?
I'm not sure how to proceed with data. Add a cmake module that check for them?
Not yet working, should be fixed by someone with more knowledge:
- kalzium (not sure about libscience, will it move into kalzium?)
- kalgebra (not sure about QtMmlWidget, it is not installed, maybe
could be moved into kalgebra)
- cantor kalgebra backend
Please review the patch.
Niko
-------------- next part --------------
Index: cmake/modules/FindCFitsio.cmake
===================================================================
--- cmake/modules/FindCFitsio.cmake (revision 1208652)
+++ cmake/modules/FindCFitsio.cmake (working copy)
@@ -1,62 +0,0 @@
-# - Try to find CFITSIO
-# Once done this will define
-#
-# CFITSIO_FOUND - system has CFITSIO
-# CFITSIO_INCLUDE_DIR - the CFITSIO include directory
-# CFITSIO_LIBRARIES - Link these to use CFITSIO
-
-# Copyright (c) 2006, Jasem Mutlaq <mutlaqja at ikarustech.com>
-# Based on FindLibfacile by Carsten Niehaus, <cniehaus at gmx.de>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-if (CFITSIO_INCLUDE_DIR AND CFITSIO_LIBRARIES)
-
- # in cache already
- set(CFITSIO_FOUND TRUE)
- message(STATUS "Found CFITSIO: ${CFITSIO_LIBRARIES}")
-
-
-else (CFITSIO_INCLUDE_DIR AND CFITSIO_LIBRARIES)
-
- if (NOT WIN32)
- find_package(PkgConfig)
- if (PKG_CONFIG_FOUND)
- pkg_check_modules(PC_CFITSIO cfitsio)
- endif (PKG_CONFIG_FOUND)
- endif (NOT WIN32)
-
- find_path(CFITSIO_INCLUDE_DIR fitsio.h
- ${PC_CFITSIO_INCLUDE_DIRS}
- ${_obIncDir}
- ${GNUWIN32_DIR}/include
- )
-
- find_library(CFITSIO_LIBRARIES NAMES cfitsio libcfitsio
- PATHS
- ${PC_CFITSIO_LIBRARY_DIRS}
- ${_obLinkDir}
- ${GNUWIN32_DIR}/lib
- )
-
- if(CFITSIO_INCLUDE_DIR AND CFITSIO_LIBRARIES)
- set(CFITSIO_FOUND TRUE)
- else (CFITSIO_INCLUDE_DIR AND CFITSIO_LIBRARIES)
- set(CFITSIO_FOUND FALSE)
- endif(CFITSIO_INCLUDE_DIR AND CFITSIO_LIBRARIES)
-
-
- if (CFITSIO_FOUND)
- if (NOT CFitsio_FIND_QUIETLY)
- message(STATUS "Found CFITSIO: ${CFITSIO_LIBRARIES}")
- endif (NOT CFitsio_FIND_QUIETLY)
- else (CFITSIO_FOUND)
- if (CFitsio_FIND_REQUIRED)
- message(FATAL_ERROR "CFITSIO not found. Please install libcfitsio0-devel and try again. http://indi.sf.net")
- endif (CFitsio_FIND_REQUIRED)
- endif (CFITSIO_FOUND)
-
- mark_as_advanced(CFITSIO_INCLUDE_DIR CFITSIO_LIBRARIES)
-
-endif (CFITSIO_INCLUDE_DIR AND CFITSIO_LIBRARIES)
Index: cmake/modules/FindR.cmake
===================================================================
--- cmake/modules/FindR.cmake (revision 1208652)
+++ cmake/modules/FindR.cmake (working copy)
@@ -1,100 +0,0 @@
-# - Try to find R
-# Once done this will define
-#
-# R_FOUND - system has R
-# R_EXECUTABLE - executable of R
-# R_HOME - home directory of R
-# R_INCLUDE_DIR - the R include directory
-# R_LIBRARIES - Link these to use R
-
-# find the R binary
-FIND_PROGRAM(R_EXECUTABLE R)
-
-IF(R_EXECUTABLE)
-
- # find R_HOME
- IF(NOT R_HOME)
- EXECUTE_PROCESS(
- COMMAND ${R_EXECUTABLE} "--slave" "--no-save" "-e" "cat(R.home())"
- OUTPUT_VARIABLE R_HOME)
- ENDIF(NOT R_HOME)
- IF(NOT R_HOME)
- MESSAGE(STATUS "Could NOT determine R_HOME (probably you misspecified the location of R)")
- ENDIF(NOT R_HOME)
-
- # find R include dir
- IF(NOT R_INCLUDE_DIR)
- IF(WIN32) # This version of the test will not work with R < 2.9.0, but the other version (in the else part) will not work on windows (and on windows the paths are generally standard, anyway).
- EXECUTE_PROCESS(
- COMMAND ${R_EXECUTABLE} "--slave" "--no-save" "-e" "cat(R.home('include'))"
- OUTPUT_VARIABLE R_INCLUDE_DIR)
- ELSE(WIN32)
- EXECUTE_PROCESS(
- COMMAND ${R_EXECUTABLE} CMD sh -c "echo -n $R_INCLUDE_DIR"
- OUTPUT_VARIABLE R_INCLUDE_DIR)
- ENDIF(WIN32)
- ENDIF(NOT R_INCLUDE_DIR)
-
- IF(NOT R_INCLUDE_DIR)
- SET(R_INCLUDE_DIR ${R_HOME}/include)
- MESSAGE(STATUS "R_Home not findable via R. Guessing")
- ENDIF(NOT R_INCLUDE_DIR)
-
- FIND_PATH(R_INCLUDE_DIR R.h)
-
- # check for existence of libR.so
-
- FIND_LIBRARY(R_R_LIBRARY
- R
- HINTS ${R_HOME}/lib ${R_SHARED_LIB_DIR} ${R_HOME}/bin )
- IF(NOT R_R_LIBRARY)
- MESSAGE(STATUS "libR not found. Make sure the location of R was detected correctly, above, and R was compiled with the --enable-shlib option")
- ELSE(NOT R_R_LIBRARY)
- GET_FILENAME_COMPONENT(R_SHARED_LIB_DIR ${R_R_LIBRARY}
- PATH)
- SET(R_LIBRARIES ${R_R_LIBRARY})
- ENDIF(NOT R_R_LIBRARY)
-
- # for at least some versions of R, we seem to have to link against -lRlapack. Else loading some
- # R packages will fail due to unresolved symbols, or we can't link against -lR.
- # However, we can't do this unconditionally,
- # as this is not available in some configurations of R
-
- FIND_LIBRARY(R_LAPACK_LIBRARY
- Rlapack
- HINTS ${R_SHARED_LIB_DIR} )
- IF(NOT R_LAPACK_LIBRARY)
- #MESSAGE(STATUS "No, it does not exist in ${R_SHARED_LIB_DIR}")
- ELSE(NOT R_LAPACK_LIBRARY)
- #MESSAGE(STATUS "Yes, ${R_LAPACK_LIBRARY} exists")
- SET(R_LIBRARIES ${R_LIBRARIES} ${R_LAPACK_LIBRARY})
- IF(NOT WIN32)
- # needed when linking to Rlapack on linux for some unknown reason.
- # apparently not needed on windows (let's see, when it comes back to bite us, though)
- # and compiling on windows is hard enough even without requiring libgfortran, too.
- SET(R_LIBRARIES ${R_LIBRARIES} gfortran)
- ENDIF(NOT WIN32)
- ENDIF(NOT R_LAPACK_LIBRARY)
-
- # for at least some versions of R, we seem to have to link against -lRlapack. Else loading some
- # R packages will fail due to unresolved symbols, or we can't link against -lR.
- # However, we can't do this unconditionally,
- # as this is not available in some configurations of R
-
- FIND_LIBRARY(R_BLAS_LIBRARY
- Rblas
- HINTS ${R_SHARED_LIB_DIR} )
- IF(NOT R_BLAS_LIBRARY)
- #MESSAGE(STATUS "No, it does not exist in ${R_SHARED_LIB_DIR}")
- ELSE(NOT R_BLAS_LIBRARY)
- #MESSAGE(STATUS "Yes, ${R_BLAS_LIBRARY} exists")
- SET(R_LIBRARIES ${R_LIBRARIES} ${R_BLAS_LIBRARY})
- ENDIF(NOT R_BLAS_LIBRARY)
-
-ENDIF( R_EXECUTABLE )
-
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(R DEFAULT_MSG
- R_EXECUTABLE R_INCLUDE_DIR R_R_LIBRARY)
-
-MARK_AS_ADVANCED(R_INCLUDE_DIR R_R_LIBRARY R_LAPACK_LIBRARY R_BLAS_LIBRARY)
Index: cmake/modules/FindQalculate.cmake
===================================================================
--- cmake/modules/FindQalculate.cmake (revision 1208652)
+++ cmake/modules/FindQalculate.cmake (working copy)
@@ -1,52 +0,0 @@
-# - Try to find libqalculate
-# Input variables
-#
-# QALCULATE_MIN_VERSION - minimal version of libqalculate
-# QALCULATE_FIND_REQUIRED - fail if can't find libqalculate
-#
-# Once done this will define
-#
-# QALCULATE_FOUND - system has libqalculate
-# QALCULATE_CFLAGS - libqalculate cflags
-# QALCULATE_LIBRARIES - libqalculate libraries
-#
-# Copyright (c) 2007, Vladimir Kuznetsov, <ks.vladimir at gmail.com>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-if(QALCULATE_CFLAGS AND QALCULATE_LIBRARIES)
-
- # in cache already
- set(QALCULATE_FOUND TRUE)
-
-else(QALCULATE_CFLAGS AND QALCULATE_LIBRARIES)
- if(NOT WIN32)
- include(UsePkgConfig)
-
- if(QALCULATE_MIN_VERSION)
- exec_program(${PKGCONFIG_EXECUTABLE} ARGS libqalculate --atleast-version=${QALCULATE_MIN_VERSION} RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull)
- else(QALCULATE_MIN_VERSION)
- exec_program(${PKGCONFIG_EXECUTABLE} ARGS libqalculate --exists RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull)
- endif(QALCULATE_MIN_VERSION)
-
- if(_return_VALUE STREQUAL "0")
- exec_program(${PKGCONFIG_EXECUTABLE} ARGS libqalculate --libs OUTPUT_VARIABLE QALCULATE_LIBRARIES)
- exec_program(${PKGCONFIG_EXECUTABLE} ARGS cln --libs OUTPUT_VARIABLE CLN_LIBRARIES)
- exec_program(${PKGCONFIG_EXECUTABLE} ARGS libqalculate --cflags OUTPUT_VARIABLE QALCULATE_CFLAGS)
- set(QALCULATE_FOUND TRUE)
- message(STATUS "qalculate found and cln is:" ${CLN_LIBRARIES})
- endif(_return_VALUE STREQUAL "0")
-
- else(NOT WIN32)
- # XXX: currently no libqalculate on windows
- set(QALCULATE_FOUND FALSE)
-
- endif(NOT WIN32)
-
- include(FindPackageHandleStandardArgs)
- FIND_PACKAGE_HANDLE_STANDARD_ARGS(Qalculate DEFAULT_MSG QALCULATE_LIBRARIES )
-
- mark_as_advanced(QALCULATE_CFLAGS QALCULATE_LIBRARIES)
-
-endif(QALCULATE_CFLAGS AND QALCULATE_LIBRARIES)
Index: cmake/modules/FindXplanet.cmake
===================================================================
--- cmake/modules/FindXplanet.cmake (revision 1208652)
+++ cmake/modules/FindXplanet.cmake (working copy)
@@ -1,42 +0,0 @@
-# - Try to find XPlanet
-# Once done this will define
-#
-# XPLANET_FOUND - system has XPlanet
-# XPLANET_EXECUTABLE - the XPlanet executable
-#
-# Copyright (c) 2008, Jerome SONRIER, <jsid at emor3j.fr.eu.org>
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-# THIS FILE NEEDS IMPROVEMENTS
-#
-
-# if ( XPLANET_EXECUTABLE )
-# # in cache already
-# set(XPLANET_FOUND TRUE)
-# message(STATUS "Found XPlanet (in cache): ${XPLANET_EXECUTABLE}")
-# else ( XPLANET_EXECUTABLE )
- set(XPLANET_EXECUTABLE XPLANET_EXECUTABLE-NOTFOUND)
- find_program(XPLANET_EXECUTABLE NAMES xplanet)
-
- if ( XPLANET_EXECUTABLE )
- set(XPLANET_FOUND TRUE)
- else ( XPLANET_EXECUTABLE )
- set(XPLANET_FOUND FALSE)
- message(STATUS "xplanet not found.")
- endif( XPLANET_EXECUTABLE )
-
- if ( XPLANET_FOUND )
- if ( NOT XPLANET_FIND_QUIETLY )
- message(STATUS "Found Xplanet: ${XPLANET_EXECUTABLE}")
- endif ( NOT XPLANET_FIND_QUIETLY )
- else ( XPLANET_FOUND )
- if ( XPLANET_FIND_REQUIRED )
- message(FATAL_ERROR "xplanet is required.")
- endif ( XPLANET_FIND_REQUIRED )
- endif ( XPLANET_FOUND )
-
- mark_as_advanced ( XPLANET_FOUND )
-
-# endif( XPLANET_EXECUTABLE )
-
Index: cmake/modules/FindINDI.cmake
===================================================================
--- cmake/modules/FindINDI.cmake (revision 1208652)
+++ cmake/modules/FindINDI.cmake (working copy)
@@ -1,78 +0,0 @@
-# - Try to find INDI
-# Once done this will define
-#
-# INDI_FOUND - system has INDI
-# INDI_INCLUDE_DIR - the INDI include directory
-# INDI_LIBRARIES - Link these to use INDI
-
-# Copyright (c) 2006, Jasem Mutlaq <mutlaqja at ikarustech.com>
-# Based on FindLibfacile by Carsten Niehaus, <cniehaus at gmx.de>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-if (INDI_INCLUDE_DIR AND INDI_LIBRARIES AND INDI_DRIVER_LIBRARIES)
-
- # in cache already
- set(INDI_FOUND TRUE)
- message(STATUS "Found INDI: ${INDI_LIBRARIES}")
-
-
-else (INDI_INCLUDE_DIR AND INDI_LIBRARIES AND INDI_DRIVER_LIBRARIES)
-
- find_path(INDI_INCLUDE_DIR indidevapi.h
- PATH_SUFFIXES libindi
- ${_obIncDir}
- ${GNUWIN32_DIR}/include
- )
-
- find_library(INDI_DRIVER_LIBRARIES NAMES indidriver
- PATHS
- ${_obLinkDir}
- ${GNUWIN32_DIR}/lib
- )
-
- find_library(INDI_LIBRARIES NAMES indi
- PATHS
- ${_obLinkDir}
- ${GNUWIN32_DIR}/lib
- )
-
- if(INDI_INCLUDE_DIR AND INDI_LIBRARIES AND INDI_DRIVER_LIBRARIES)
- set(INDI_FOUND TRUE)
- else (INDI_INCLUDE_DIR AND INDI_LIBRARIES AND INDI_DRIVER_LIBRARIES)
- set(INDI_FOUND FALSE)
- endif(INDI_INCLUDE_DIR AND INDI_LIBRARIES AND INDI_DRIVER_LIBRARIES)
-
- # Find pkg-config
- FIND_PROGRAM(PKGCONFIG_EXECUTABLE NAMES pkg-config PATHS /usr/bin/ /usr/local/bin )
-
- # query pkg-config asking for a libindi >= 0.6.2
- EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=0.6.2 libindi RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull )
- if(_return_VALUE STREQUAL "0")
- set(INDI_FOUND TRUE)
- else(_return_VALUE STREQUAL "0")
- set(INDI_FOUND FALSE)
- message(STATUS "Could NOT find libindi. pkg-config indicates that libindi >= 0.6.2 is not installed.")
- endif(_return_VALUE STREQUAL "0")
-
- # Find INDI Server
- FIND_PROGRAM(INDISERVER NAMES indiserver PATHS /usr/bin/ /usr/local/bin )
-
- if (INDISERVER-NOTFOUND)
- set(INDI_FOUND FALSE)
- endif(INDISERVER-NOTFOUND)
-
- if (INDI_FOUND)
- if (NOT INDI_FIND_QUIETLY)
- message(STATUS "Found INDI: ${INDI_LIBRARIES}, ${INDI_DRIVER_LIBRARIES}")
- endif (NOT INDI_FIND_QUIETLY)
- else (INDI_FOUND)
- if (INDI_FIND_REQUIRED)
- message(FATAL_ERROR "libindi and indiserver not found. Please install libindi and try again. http://www.indilib.org")
- endif (INDI_FIND_REQUIRED)
- endif (INDI_FOUND)
-
- mark_as_advanced(INDI_INCLUDE_DIR INDI_LIBRARIES INDI_DRIVER_LIBRARIES)
-
-endif (INDI_INCLUDE_DIR AND INDI_LIBRARIES AND INDI_DRIVER_LIBRARIES)
Index: cmake/modules/FindReadline.cmake
===================================================================
--- cmake/modules/FindReadline.cmake (revision 1208652)
+++ cmake/modules/FindReadline.cmake (working copy)
@@ -1,15 +0,0 @@
-# GNU Readline library finder
-if(READLINE_INCLUDE_DIR AND READLINE_LIBRARY AND NCURSES_LIBRARY)
- set(READLINE_FOUND TRUE)
-else(READLINE_INCLUDE_DIR AND READLINE_LIBRARY AND NCURSES_LIBRARY)
- FIND_PATH(READLINE_INCLUDE_DIR readline/readline.h
- /usr/include/readline
- )
-
- FIND_LIBRARY(READLINE_LIBRARY NAMES readline)
- FIND_LIBRARY(NCURSES_LIBRARY NAMES ncurses )
- include(FindPackageHandleStandardArgs)
- FIND_PACKAGE_HANDLE_STANDARD_ARGS(Readline DEFAULT_MSG NCURSES_LIBRARY READLINE_INCLUDE_DIR READLINE_LIBRARY )
-
- MARK_AS_ADVANCED(READLINE_INCLUDE_DIR READLINE_LIBRARY)
-endif(READLINE_INCLUDE_DIR AND READLINE_LIBRARY AND NCURSES_LIBRARY)
Index: cmake/modules/FindGSL.cmake
===================================================================
--- cmake/modules/FindGSL.cmake (revision 1208652)
+++ cmake/modules/FindGSL.cmake (working copy)
@@ -1,37 +0,0 @@
-# - Try to find the freetype library
-# GSL_FOUND - system has libusb
-# GSL_INCLUDE_DIR - the libusb include directory
-# GSL_LIBRARIES - Link these to use libusb
-
-# Copyright (c) 2008, Allen Winter <winter at kde.org>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-if (GSL_INCLUDE_DIR AND GSL_LIBRARIES)
-
- # Already in cache, be silent
- set(GSL_FIND_QUIETLY TRUE)
-
-else (GSL_INCLUDE_DIR AND GSL_LIBRARIES)
- IF (NOT WIN32)
- # use pkg-config to get the directories and then use these values
- # in the FIND_PATH() and FIND_LIBRARY() calls
- INCLUDE(UsePkgConfig)
-
- PKGCONFIG(gsl _GSLIncDir _GSLLinkDir _GSLLinkFlags _GSLCflags)
- ENDIF(NOT WIN32)
-
- find_path(GSL_INCLUDE_DIR
- NAMES gsl_cdf.h gsl_randist.h
- PATH_SUFFIXES gsl
- PATHS ${_GSLIncDir})
- set(GSL_LIBRARIES ${_GSLLinkFlags})
-
- mark_as_advanced(GSL_INCLUDE_DIR GSL_LIBRARIES)
-
-endif (GSL_INCLUDE_DIR AND GSL_LIBRARIES)
-
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(GSL DEFAULT_MSG
- GSL_LIBRARIES GSL_INCLUDE_DIR)
Index: cmake/modules/FindLibSpectre.cmake
===================================================================
--- cmake/modules/FindLibSpectre.cmake (revision 1208652)
+++ cmake/modules/FindLibSpectre.cmake (working copy)
@@ -1,67 +0,0 @@
-# - Try to find the libspectre PS library
-# Once done this will define
-#
-# LIBSPECTRE_FOUND - system has libspectre
-# LIBSPECTRE_INCLUDE_DIR - the libspectre include directory
-# LIBSPECTRE_LIBRARY - Link this to use libspectre
-#
-
-# Copyright (c) 2006-2007, Pino Toscano, <pino at kde.org>
-# Copyright (c) 2008, Albert Astals Cid, <aacid at kde.org>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-if(LIBSPECTRE_INCLUDE_DIR AND LIBSPECTRE_LIBRARY)
-
- # in cache already
- set(LIBSPECTRE_FOUND TRUE)
-
-else(LIBSPECTRE_INCLUDE_DIR AND LIBSPECTRE_LIBRARY)
-
-if(NOT WIN32)
- # use pkg-config to get the directories and then use these values
- # in the FIND_PATH() and FIND_LIBRARY() calls
- INCLUDE(UsePkgConfig)
-
- PKGCONFIG(libspectre _SpectreIncDir _SpectreLinkDir _SpectreLinkFlags _SpectreCflags)
-
- if(_SpectreLinkFlags)
- # find again pkg-config, to query it about libspectre version
- FIND_PROGRAM(PKGCONFIG_EXECUTABLE NAMES pkg-config PATHS /usr/bin/ /usr/local/bin )
-
- # query pkg-config asking for a libspectre >= LIBSPECTRE_MINIMUM_VERSION
- EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=${LIBSPECTRE_MINIMUM_VERSION} libspectre RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull )
- if(_return_VALUE STREQUAL "0")
- set(LIBSPECTRE_FOUND TRUE)
- endif(_return_VALUE STREQUAL "0")
- endif(_SpectreLinkFlags)
-else(NOT WIN32)
- # do not use pkg-config on windows
- find_library(_SpectreLinkFlags NAMES libspectre spectre PATHS ${CMAKE_LIBRARY_PATH})
-
- find_path(LIBSPECTRE_INCLUDE_DIR spectre.h PATH_SUFFIXES libspectre )
-
- set(LIBSPECTRE_FOUND TRUE)
-endif(NOT WIN32)
-
-if (LIBSPECTRE_FOUND)
- set(LIBSPECTRE_LIBRARY ${_SpectreLinkFlags})
-
- # the cflags for libspectre can contain more than one include path
- separate_arguments(_SpectreCflags)
- foreach(_includedir ${_SpectreCflags})
- string(REGEX REPLACE "-I(.+)" "\\1" _includedir "${_includedir}")
- set(LIBSPECTRE_INCLUDE_DIR ${LIBSPECTRE_INCLUDE_DIR} ${_includedir})
- endforeach(_includedir)
-
-endif (LIBSPECTRE_FOUND)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(LibSpectre DEFAULT_MSG LIBSPECTRE_LIBRARY LIBSPECTRE_FOUND)
-
-# ensure that they are cached
-set(LIBSPECTRE_INCLUDE_DIR ${LIBSPECTRE_INCLUDE_DIR} CACHE INTERNAL "The libspectre include path")
-set(LIBSPECTRE_LIBRARY ${LIBSPECTRE_LIBRARY} CACHE INTERNAL "The libspectre library")
-
-endif(LIBSPECTRE_INCLUDE_DIR AND LIBSPECTRE_LIBRARY)
Index: blinken/src/blinken.cpp
===================================================================
--- blinken/src/blinken.cpp (revision 1208653)
+++ blinken/src/blinken.cpp (working copy)
@@ -28,7 +28,7 @@
#include "button.h"
#include "counter.h"
-#include "libkdeedu/kdeeduui/kedufontutils.h"
+#include <kedufontutils.h>
#include "number.h"
#include "highscoredialog.h"
#include "settings.h"
Index: blinken/src/highscoredialog.cpp
===================================================================
--- blinken/src/highscoredialog.cpp (revision 1208653)
+++ blinken/src/highscoredialog.cpp (working copy)
@@ -19,7 +19,7 @@
#include <ktabwidget.h>
#include "counter.h"
-#include "libkdeedu/kdeeduui/kedufontutils.h"
+#include <kedufontutils.h>
#include "settings.h"
static const int margin = 15;
Index: blinken/src/CMakeLists.txt
===================================================================
--- blinken/src/CMakeLists.txt (revision 1208653)
+++ blinken/src/CMakeLists.txt (working copy)
@@ -1,3 +1,4 @@
+include_directories( ${LIBKDEEDU_INCLUDE_DIR} )
########### next target ###############
@@ -20,7 +21,7 @@
kde4_add_executable(blinken ${blinken_SRCS})
-target_link_libraries(blinken ${KDE4_KIO_LIBS} ${KDE4_PHONON_LIBS} kdeeduui )
+target_link_libraries(blinken ${KDE4_KIO_LIBS} ${KDE4_PHONON_LIBS} ${LIBKDEEDU_KDEEDUUI_LIBRARIES} )
install(TARGETS blinken ${INSTALL_TARGETS_DEFAULT_ARGS} )
Index: blinken/CMakeLists.txt
===================================================================
--- blinken/CMakeLists.txt (revision 1208653)
+++ blinken/CMakeLists.txt (working copy)
@@ -1,5 +1,13 @@
project(blinken)
+find_package(KDE4 REQUIRED)
+include(KDE4Defaults)
+include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
+
+set(CMAKE_MODULE_PATH ${blinken_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
+
+find_package(LibKdeEdu REQUIRED)
+
add_subdirectory( src )
add_subdirectory( images )
add_subdirectory( icons )
Index: khangman/src/CMakeLists.txt
===================================================================
--- khangman/src/CMakeLists.txt (revision 1208653)
+++ khangman/src/CMakeLists.txt (working copy)
@@ -1,5 +1,5 @@
-include_directories( ${CMAKE_SOURCE_DIR}/libkdeedu/keduvocdocument )
+include_directories( ${LIBKDEEDU_INCLUDE_DIR} )
########### next target ###############
@@ -24,7 +24,7 @@
kde4_add_executable(khangman ${khangman_SRCS})
add_dependencies(khangman kvtml_data)
-target_link_libraries(khangman keduvocdocument ${KDE4_KIO_LIBS} ${KDE4_KNEWSTUFF3_LIBS} ${KDE4_PHONON_LIBS} )
+target_link_libraries(khangman ${LIBKDEEDU_KDEUVOCDOCUMENT_LIBRARIES} ${KDE4_KIO_LIBS} ${KDE4_KNEWSTUFF3_LIBS} ${KDE4_PHONON_LIBS} )
install(TARGETS khangman ${INSTALL_TARGETS_DEFAULT_ARGS} )
Index: khangman/CMakeLists.txt
===================================================================
--- khangman/CMakeLists.txt (revision 1208653)
+++ khangman/CMakeLists.txt (working copy)
@@ -1,5 +1,13 @@
project(khangman)
+find_package(KDE4 REQUIRED)
+include(KDE4Defaults)
+include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
+
+set(CMAKE_MODULE_PATH ${khangman_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
+
+find_package(LibKdeEdu REQUIRED)
+
add_subdirectory( src )
add_subdirectory( themes )
Index: cantor/src/backends/octave/scripts/CMakeLists.txt
===================================================================
--- cantor/src/backends/octave/scripts/CMakeLists.txt (revision 1208653)
+++ cantor/src/backends/octave/scripts/CMakeLists.txt (working copy)
@@ -6,6 +6,6 @@
set(PLOT_FILE_SUFFIX png)
endif (WITH_EPS)
-configure_file(cantor_print.m.in cantor_print.m)
+configure_file(cantor_print.m.in ${CMAKE_CURRENT_BINARY_DIR}/cantor_print.m)
install( FILES cantor_eigenvectors.m cantor_plot2d.m cantor_plot3d.m ${CMAKE_CURRENT_BINARY_DIR}/cantor_print.m DESTINATION ${OCTAVE_SCRIPT_INSTALL_DIR} )
Index: cantor/CMakeLists.txt
===================================================================
--- cantor/CMakeLists.txt (revision 1208653)
+++ cantor/CMakeLists.txt (working copy)
@@ -1,5 +1,10 @@
project(cantor)
+find_package(KDE4 REQUIRED)
+include(KDE4Defaults)
+
+set(CMAKE_MODULE_PATH ${cantor_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
+
macro_optional_find_package(R)
macro_log_feature(R_FOUND "R" "A free software environment for statistical computing and graphics" "http://www.r-project.org/" FALSE "" "Backend to use R with Cantor.")
Index: libkdeedu/kdeeduui/CMakeLists.txt
===================================================================
--- libkdeedu/kdeeduui/CMakeLists.txt (revision 1208653)
+++ libkdeedu/kdeeduui/CMakeLists.txt (working copy)
@@ -14,7 +14,7 @@
target_link_libraries(kdeeduui ${KDE4_KHTML_LIBS} ${QT_QTXML_LIBRARY})
set_target_properties(kdeeduui PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
-install(TARGETS kdeeduui ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS kdeeduui EXPORT LibKdeEduTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
########### install files ###############
Index: libkdeedu/keduvocdocument/tests/CMakeLists.txt
===================================================================
--- libkdeedu/keduvocdocument/tests/CMakeLists.txt (revision 1208653)
+++ libkdeedu/keduvocdocument/tests/CMakeLists.txt (working copy)
@@ -9,7 +9,7 @@
# CONVERTER:
-include_directories( ${CMAKE_SOURCE_DIR}/libkdeedu/keduvocdocument/ )
+include_directories( .. )
########### next target ###############
Index: libkdeedu/keduvocdocument/CMakeLists.txt
===================================================================
--- libkdeedu/keduvocdocument/CMakeLists.txt (revision 1208653)
+++ libkdeedu/keduvocdocument/CMakeLists.txt (working copy)
@@ -46,7 +46,7 @@
# SOVERSION ${LIB_KEDUVOCDOCUMENT_SOVERSION}
#)
-install(TARGETS keduvocdocument ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS keduvocdocument EXPORT LibKdeEduTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
########### install files ###############
@@ -68,5 +68,7 @@
keduvocwordtype.h
keduvocpersonalpronoun.h
sharedkvtmlfiles.h
+ keduvocdeclension.h
+ keduvockvtml2writer.h
DESTINATION ${INCLUDE_INSTALL_DIR}/libkdeedu COMPONENT Devel
)
Index: libkdeedu/LibKdeEduConfig.cmake.in
===================================================================
--- libkdeedu/LibKdeEduConfig.cmake.in (revision 0)
+++ libkdeedu/LibKdeEduConfig.cmake.in (revision 0)
@@ -0,0 +1,44 @@
+#########################################################################
+#
+# LibKdeEdu Configuration File
+#
+# This file sets various CMake Variables
+#
+# LIBKDEEDU_INCLUDE_DIR - The Include Directory for all LIBKDEEDU libraries
+# LIBKDEEDU_KDEUVOCDOCUMENT_LIBRARIES - the keduvocdocument library
+# LIBKDEEDU_KDEEDUUI_LIBRARIES - the kdeeduui library
+#
+# Copyright 2008 Andreas Pakulat <apaku at gmx.de>
+# Copyright 2010 Niko Sams <niko.sams at gmail.com>
+# Redistribution and use is allowed according to the terms of the BSD license.
+######################################################################
+
+get_filename_component(_LIBKDEEDU_CURRENT_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
+
+if(NOT WIN32)
+# This is needed on non-win32 platforms, as lib-install-dir might be in a
+# totally different prefix than include-install-dir. So instead hardcode the
+# absolute path during buildtime
+set( LIBKDEEDU_INCLUDE_DIR "@INCLUDE_INSTALL_DIR@/libkdeedu" )
+
+else(NOT WIN32)
+
+set( LIBKDEEDU_INCLUDE_DIR "${_LIBKDEEDU_CURRENT_DIR}/../../../include/libkdeedu" )
+
+endif(NOT WIN32)
+
+if( NOT TARGET LibKdeEduImport__keduvocdocument )
+ include("${_LIBKDEEDU_CURRENT_DIR}/LibKdeEduTargets.cmake")
+endif( NOT TARGET LibKdeEduImport__keduvocdocument )
+
+macro( _libkdeedu_set_lib_vars _prefix _lib )
+ set( LIBKDEEDU_${_prefix}_LIBRARIES LibKdeEduImport__${_lib} )
+endmacro( _libkdeedu_set_lib_vars )
+
+_libkdeedu_set_lib_vars( KDEUVOCDOCUMENT keduvocdocument )
+_libkdeedu_set_lib_vars( KDEEDUUI kdeeduui )
+
+
+mark_as_advanced(
+ KDEUVOCDOCUMENT
+)
Index: libkdeedu/CMakeLists.txt
===================================================================
--- libkdeedu/CMakeLists.txt (revision 1208653)
+++ libkdeedu/CMakeLists.txt (working copy)
@@ -1,10 +1,31 @@
-project(libkdeedu)
+project(LibKdeEdu)
#add_definitions( -Wall -fprofile-arcs -ftest-coverage )
+find_package(KDE4 REQUIRED)
+include(KDE4Defaults)
+include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
+
add_subdirectory(keduvocdocument)
add_subdirectory(kdeeduui)
add_subdirectory(libscience)
#add_subdirectory(widgets)
add_subdirectory(qtmmlwidget)
add_subdirectory(icons)
+
+
+configure_file( "${LibKdeEdu_SOURCE_DIR}/LibKdeEduConfig.cmake.in" "${LibKdeEdu_BINARY_DIR}/LibKdeEduConfig.cmake" @ONLY )
+
+if(KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR)
+ set(_LibKdeEdu_CONFIG_DEST "${LIB_INSTALL_DIR}/cmake/libkdeedu")
+else(KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR)
+ set(_LibKdeEdu_CONFIG_DEST "${LIB_INSTALL_DIR}/libkdeedu")
+endif(KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR)
+
+install( FILES
+ "${LibKdeEdu_BINARY_DIR}/LibKdeEduConfig.cmake"
+ DESTINATION "${_LibKdeEdu_CONFIG_DEST}" )
+install( EXPORT LibKdeEduTargets
+ DESTINATION "${_LibKdeEdu_CONFIG_DEST}"
+ NAMESPACE LibKdeEduImport__
+ FILE LibKdeEduTargets.cmake )
Index: kturtle/CMakeLists.txt
===================================================================
--- kturtle/CMakeLists.txt (revision 1208652)
+++ kturtle/CMakeLists.txt (working copy)
@@ -1,4 +1,9 @@
project (kturtle)
+find_package(KDE4 REQUIRED)
+include(KDE4Defaults)
+
+include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${QT4_INCLUDES})
+
add_subdirectory (src)
add_subdirectory (icons)
Index: klettres/CMakeLists.txt
===================================================================
--- klettres/CMakeLists.txt (revision 1208652)
+++ klettres/CMakeLists.txt (working copy)
@@ -1,5 +1,10 @@
project(klettres)
+find_package(KDE4 REQUIRED)
+include(KDE4Defaults)
+
+include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${QT4_INCLUDES})
+
add_subdirectory( src )
add_subdirectory( pics )
Index: kwordquiz/src/CMakeLists.txt
===================================================================
--- kwordquiz/src/CMakeLists.txt (revision 1208653)
+++ kwordquiz/src/CMakeLists.txt (working copy)
@@ -3,7 +3,7 @@
add_subdirectory( icons ) # global icons
add_subdirectory( examples )
-include_directories( ${CMAKE_SOURCE_DIR}/libkdeedu/keduvocdocument )
+include_directories( ${LIBKDEEDU_INCLUDE_DIR} )
########### next target ###############
@@ -65,7 +65,7 @@
kde4_add_executable(kwordquiz ${kwordquiz_SRCS})
-target_link_libraries(kwordquiz keduvocdocument ${KDE4_KIO_LIBS} ${KDE4_KNEWSTUFF3_LIBS} ${KDE4_KNOTIFYCONFIG_LIBS} ${KDE4_KUTILS_LIBS} ${KDE4_PHONON_LIBRARY})
+target_link_libraries(kwordquiz ${LIBKDEEDU_KDEUVOCDOCUMENT_LIBRARIES} ${KDE4_KIO_LIBS} ${KDE4_KNEWSTUFF3_LIBS} ${KDE4_KNOTIFYCONFIG_LIBS} ${KDE4_KUTILS_LIBS} ${KDE4_PHONON_LIBRARY})
install(TARGETS kwordquiz ${INSTALL_TARGETS_DEFAULT_ARGS} )
Index: kwordquiz/CMakeLists.txt
===================================================================
--- kwordquiz/CMakeLists.txt (revision 1208653)
+++ kwordquiz/CMakeLists.txt (working copy)
@@ -1,4 +1,12 @@
project(kwordquiz)
+find_package(KDE4 REQUIRED)
+include(KDE4Defaults)
+include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
+
+set(CMAKE_MODULE_PATH ${kwordquiz_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
+
+find_package(LibKdeEdu REQUIRED)
+
add_subdirectory( src )
Index: kmplot/kmplot/xparser.cpp
===================================================================
--- kmplot/kmplot/xparser.cpp (revision 1208652)
+++ kmplot/kmplot/xparser.cpp (working copy)
@@ -25,7 +25,7 @@
#include "xparser.h"
-#include <kmplot/config-kmplot.h>
+#include "config-kmplot.h"
// local includes
#include "parseradaptor.h"
Index: kmplot/kmplot/view.cpp
===================================================================
--- kmplot/kmplot/view.cpp (revision 1208652)
+++ kmplot/kmplot/view.cpp (working copy)
@@ -25,7 +25,7 @@
#include "view.h"
-#include <kmplot/config-kmplot.h>
+#include "config-kmplot.h"
// Qt includes
#include <QAbstractTextDocumentLayout>
Index: kmplot/CMakeLists.txt
===================================================================
--- kmplot/CMakeLists.txt (revision 1208652)
+++ kmplot/CMakeLists.txt (working copy)
@@ -1,5 +1,10 @@
project(kmplot)
+find_package(KDE4 REQUIRED)
+include(KDE4Defaults)
+
+include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${QT4_INCLUDES})
+
check_include_files(ieeefp.h HAVE_IEEEFP_H)
configure_file(config-kmplot.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kmplot.h)
Index: kig/CMakeLists.txt
===================================================================
--- kig/CMakeLists.txt (revision 1208652)
+++ kig/CMakeLists.txt (working copy)
@@ -1,5 +1,10 @@
project(kig)
+find_package(KDE4 REQUIRED)
+include(KDE4Defaults)
+
+include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${QT4_INCLUDES})
+
kde4_no_enable_final(kig)
include(KigConfigureChecks.cmake)
Index: kiten/CMakeLists.txt
===================================================================
--- kiten/CMakeLists.txt (revision 1208652)
+++ kiten/CMakeLists.txt (working copy)
@@ -1,6 +1,11 @@
#Name the project
project(kiten)
+find_package(KDE4 REQUIRED)
+include(KDE4Defaults)
+
+include_directories (${CMAKE_SOURCE_DIR} ${KDE4_INCLUDES} ${QT4_INCLUDES})
+
## Make it easy for radselect and kiten to find libkiten headers
include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/lib)
include_directories(${CMAKE_CURRENT_BINARY_DIR})
Index: kanagram/cmake/FindLibKdeEdu.cmake
===================================================================
--- kanagram/cmake/FindLibKdeEdu.cmake (revision 0)
+++ kanagram/cmake/FindLibKdeEdu.cmake (revision 0)
@@ -0,0 +1,26 @@
+#
+# Find the LibKdeEdu modules and sets various variables accordingly
+#
+# Example usage of this module:
+# find_package(LibKdeEdu 1.0.0 REQUIRED)
+#
+# The version number and REQUIRED flag are optional. You can set CMAKE_PREFIX_PATH
+# variable to help it find the required files and directories
+
+# LIBKDEEDU_FOUND - set to TRUE if the platform was found and the version is compatible FALSE otherwise
+#
+# LIBKDEEDU_KDEUVOCDOCUMENT_LIBRARIES - the keduvocdocument library
+# LIBKDEEDU_KDEEDUUI_LIBRARIES - the kdeeduui library
+#
+#
+# Copyright 2007 Andreas Pakulat <apaku at gmx.de>
+# Copyright 2010 Niko Sams <niko.sams at gmail.com>
+# Redistribution and use is allowed according to the terms of the BSD license.
+
+set(_LibKdeEdu_FIND_QUIETLY ${LibKdeEdu_FIND_QUIETLY})
+find_package( LibKdeEdu ${LibKdeEdu_FIND_VERSION} NO_MODULE )
+set(LibKdeEdu_FIND_QUIETLY ${_LibKdeEdu_FIND_QUIETLY})
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(LibKdeEdu DEFAULT_MSG LibKdeEdu_CONFIG )
+
Property changes on: kanagram/cmake/FindLibKdeEdu.cmake
___________________________________________________________________
Added: svn:eol-style
+ native
Index: kanagram/src/kanagram.cpp
===================================================================
--- kanagram/src/kanagram.cpp (revision 1208653)
+++ kanagram/src/kanagram.cpp (working copy)
@@ -51,7 +51,7 @@
#include "kanagramsettings.h"
#include "mainsettings.h"
#include "vocabsettings.h"
-#include "libkdeedu/kdeeduui/kedufontutils.h"
+#include <kedufontutils.h>
static const char* m_textRevealWord = I18N_NOOP("reveal word");
static const char* m_textHint = I18N_NOOP("hint");
Index: kanagram/src/CMakeLists.txt
===================================================================
--- kanagram/src/CMakeLists.txt (revision 1208653)
+++ kanagram/src/CMakeLists.txt (working copy)
@@ -1,7 +1,6 @@
-include_directories( ${CMAKE_SOURCE_DIR}/libkdeedu/keduvocdocument/ )
+include_directories( ${LIBKDEEDU_INCLUDE_DIR} )
-
########### next target ###############
set(kanagram_SRCS
@@ -27,7 +26,7 @@
kde4_add_executable(kanagram ${kanagram_SRCS})
add_dependencies(kanagram kvtml_data)
-target_link_libraries(kanagram ${KDE4_KNEWSTUFF3_LIBS} ${KDE4_PHONON_LIBS} ${QT_QTXML_LIBRARY} keduvocdocument kdeeduui )
+target_link_libraries(kanagram ${KDE4_KNEWSTUFF3_LIBS} ${KDE4_PHONON_LIBS} ${QT_QTXML_LIBRARY} ${LIBKDEEDU_KDEUVOCDOCUMENT_LIBRARIES} ${LIBKDEEDU_KDEEDUUI_LIBRARIES} )
install(TARGETS kanagram ${INSTALL_TARGETS_DEFAULT_ARGS} )
Index: kanagram/CMakeLists.txt
===================================================================
--- kanagram/CMakeLists.txt (revision 1208653)
+++ kanagram/CMakeLists.txt (working copy)
@@ -1,5 +1,13 @@
project(kanagram)
+find_package(KDE4 REQUIRED)
+include(KDE4Defaults)
+include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
+
+set(CMAKE_MODULE_PATH ${kanagram_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
+
+find_package(LibKdeEdu REQUIRED)
+
add_subdirectory( images )
add_subdirectory( src )
add_subdirectory( icons )
Index: parley/src/CMakeLists.txt
===================================================================
--- parley/src/CMakeLists.txt (revision 1208653)
+++ parley/src/CMakeLists.txt (working copy)
@@ -4,7 +4,7 @@
add_subdirectory( settings )
# libkdeedu/keduvocdocument contains the library for reading and writing vocabulary files
-include_directories( ${CMAKE_SOURCE_DIR}/libkdeedu/keduvocdocument/ )
+include_directories( ${LIBKDEEDU_INCLUDE_DIR} )
set(parley_SRCS
main.cpp
@@ -164,7 +164,7 @@
target_link_libraries(
parley
- keduvocdocument
+ ${LIBKDEEDU_KDEUVOCDOCUMENT_LIBRARIES}
${KDE4_KHTML_LIBS}
${KDE4_KNEWSTUFF3_LIBS}
${KDE4_PHONON_LIBS}
Index: parley/plasmoid/engine/CMakeLists.txt
===================================================================
--- parley/plasmoid/engine/CMakeLists.txt (revision 1208653)
+++ parley/plasmoid/engine/CMakeLists.txt (working copy)
@@ -2,12 +2,12 @@
parley_engine.cpp
)
-include_directories( ${CMAKE_SOURCE_DIR}/libkdeedu/keduvocdocument/ )
+include_directories( ${LIBKDEEDU_INCLUDE_DIR} )
kde4_add_plugin(plasma_engine_parley ${parley_engine_SRCS})
target_link_libraries(plasma_engine_parley ${KDE4_KDECORE_LIBS}
plasma
- keduvocdocument
+ ${LIBKDEEDU_KDEUVOCDOCUMENT_LIBRARIES}
)
install(TARGETS plasma_engine_parley DESTINATION ${PLUGIN_INSTALL_DIR})
Index: parley/plasmoid/CMakeLists.txt
===================================================================
--- parley/plasmoid/CMakeLists.txt (revision 1208653)
+++ parley/plasmoid/CMakeLists.txt (working copy)
@@ -1,7 +1,7 @@
project(plasma-parley)
add_subdirectory( engine )
-include_directories( ${CMAKE_SOURCE_DIR}/libkdeedu/keduvocdocument/ )
+include_directories( ${LIBKDEEDU_INCLUDE_DIR} )
set(parley_plasma_SRCS
parley_plasma.cpp
)
@@ -11,7 +11,7 @@
kde4_add_plugin(plasma_applet_parley ${parley_plasma_SRCS})
target_link_libraries(plasma_applet_parley
plasma ${KDE4_KIO_LIBS}
- keduvocdocument
+ ${LIBKDEEDU_KDEUVOCDOCUMENT_LIBRARIES}
)
install(
Index: parley/CMakeLists.txt
===================================================================
--- parley/CMakeLists.txt (revision 1208653)
+++ parley/CMakeLists.txt (working copy)
@@ -1,5 +1,14 @@
project(parley)
+find_package(KDE4 REQUIRED)
+include(KDE4Defaults)
+include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
+
+set(CMAKE_MODULE_PATH ${parley_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
+
+find_package(LibKdeEdu REQUIRED)
+
+
macro_optional_find_package(LibXslt)
macro_optional_find_package(LibXml2)
find_package(LibAttica)
Index: ktouch/CMakeLists.txt
===================================================================
--- ktouch/CMakeLists.txt (revision 1208652)
+++ ktouch/CMakeLists.txt (working copy)
@@ -3,6 +3,11 @@
project( ktouch )
+find_package(KDE4 REQUIRED)
+include(KDE4Defaults)
+
+include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${QT4_INCLUDES})
+
# subdirectories to build
add_subdirectory( src )
add_subdirectory( keyboards )
Index: kgeography/CMakeLists.txt
===================================================================
--- kgeography/CMakeLists.txt (revision 1208652)
+++ kgeography/CMakeLists.txt (working copy)
@@ -1,5 +1,10 @@
project(kgeography)
+find_package(KDE4 REQUIRED)
+include(KDE4Defaults)
+
+include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${QT4_INCLUDES})
+
add_subdirectory( src )
add_subdirectory( data )
add_subdirectory( icons )
Index: kstars/CMakeLists.txt
===================================================================
--- kstars/CMakeLists.txt (revision 1208652)
+++ kstars/CMakeLists.txt (working copy)
@@ -1,5 +1,12 @@
project(kstars)
+find_package(KDE4 REQUIRED)
+include(KDE4Defaults)
+
+include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${QT4_INCLUDES})
+
+set(CMAKE_MODULE_PATH ${kstars_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
+
# some configure checks needed for kstars
include(CheckIncludeFiles)
Index: kalgebra/analitza/tests/CMakeLists.txt
===================================================================
--- kalgebra/analitza/tests/CMakeLists.txt (revision 1208652)
+++ kalgebra/analitza/tests/CMakeLists.txt (working copy)
@@ -1,6 +1,6 @@
set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
-include_directories(${CMAKE_SOURCE_DIR}/kalgebra/analitza)
+include_directories(${CMAKE_SOURCE_DIR}/analitza)
set(testLibs ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTTEST_LIBRARY} ${KDE4_KDECORE_LIBS} analitza)
Index: kalgebra/CMakeLists.txt
===================================================================
--- kalgebra/CMakeLists.txt (revision 1208652)
+++ kalgebra/CMakeLists.txt (working copy)
@@ -1,5 +1,13 @@
project(kalgebra)
+find_package(KDE4 REQUIRED)
+include(KDE4Defaults)
+
+include_directories( ${KDE4_INCLUDES} ${QT_INCLUDES} )
+
+set(CMAKE_MODULE_PATH ${kalgebra_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
+
+
#Checking whether we can compile calgebra
include(CheckIncludeFiles)
macro_optional_find_package(Readline)
Index: step/CMakeLists.txt
===================================================================
--- step/CMakeLists.txt (revision 1208652)
+++ step/CMakeLists.txt (working copy)
@@ -1,5 +1,12 @@
project(step)
+find_package(KDE4 REQUIRED)
+include(KDE4Defaults)
+
+include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${QT4_INCLUDES})
+
+set(CMAKE_MODULE_PATH ${step_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
+
macro_optional_find_package(GSL)
macro_optional_find_package(Qalculate)
Index: kalzium/CMakeLists.txt
===================================================================
--- kalzium/CMakeLists.txt (revision 1208652)
+++ kalzium/CMakeLists.txt (working copy)
@@ -1,5 +1,12 @@
project(kalzium)
+find_package(KDE4 REQUIRED)
+include(KDE4Defaults)
+
+set(CMAKE_MODULE_PATH ${cantor_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
+
+include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${QT4_INCLUDES})
+
kde4_no_enable_final(kalzium)
include(KalziumConfigureChecks.cmake)
Index: kbruch/CMakeLists.txt
===================================================================
--- kbruch/CMakeLists.txt (revision 1208652)
+++ kbruch/CMakeLists.txt (working copy)
@@ -1,3 +1,8 @@
project(kbruch)
+find_package(KDE4 REQUIRED)
+include(KDE4Defaults)
+
+include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${QT4_INCLUDES})
+
add_subdirectory( src )
More information about the kde-edu
mailing list