[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdeedu
From: Niko Sams <niko.sams () gmail ! com>
Date: 2010-12-22 18:08:46
Message-ID: 20101222180846.1FC04AC8AA () svn ! kde ! org
[Download RAW message or body]
SVN commit 1208653 by nsams:
revert previous commit
this has to be reviewed first
(I wanted to commit to my local git and missplaced git with svn, sorry)
M +0 -8 blinken/CMakeLists.txt
M +1 -2 blinken/src/CMakeLists.txt
M +1 -1 blinken/src/blinken.cpp
M +1 -1 blinken/src/highscoredialog.cpp
M +0 -5 cantor/CMakeLists.txt
D cantor/cmake (directory)
M +1 -1 cantor/src/backends/octave/scripts/CMakeLists.txt
A cmake/modules/FindLibSpectre.cmake \
cmake/modules/FindLibSpectre.cmake#1208651 A cmake/modules/FindR.cmake \
cmake/modules/FindR.cmake#1208651 M +0 -8 kanagram/CMakeLists.txt
M +3 -2 kanagram/src/CMakeLists.txt
M +1 -1 kanagram/src/kanagram.cpp
M +0 -8 khangman/CMakeLists.txt
M +2 -2 khangman/src/CMakeLists.txt
M +2 -2 khangman/src/main.cpp
M +0 -8 kwordquiz/CMakeLists.txt
M +2 -2 kwordquiz/src/CMakeLists.txt
M +1 -22 libkdeedu/CMakeLists.txt
M +1 -1 libkdeedu/kdeeduui/CMakeLists.txt
M +1 -3 libkdeedu/keduvocdocument/CMakeLists.txt
M +1 -1 libkdeedu/keduvocdocument/tests/CMakeLists.txt
M +0 -9 parley/CMakeLists.txt
M +2 -2 parley/plasmoid/CMakeLists.txt
M +2 -2 parley/plasmoid/engine/CMakeLists.txt
M +2 -2 parley/src/CMakeLists.txt
M +0 -2 parley/src/parleyactions.cpp
--- trunk/KDE/kdeedu/blinken/CMakeLists.txt #1208652:1208653
@@ -1,13 +1,5 @@
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 )
--- trunk/KDE/kdeedu/blinken/src/CMakeLists.txt #1208652:1208653
@@ -1,4 +1,3 @@
-include_directories( ${LIBKDEEDU_INCLUDE_DIR} )
########### next target ###############
@@ -21,7 +20,7 @@
kde4_add_executable(blinken ${blinken_SRCS})
-target_link_libraries(blinken ${KDE4_KIO_LIBS} ${KDE4_PHONON_LIBS} \
${LIBKDEEDU_KDEEDUUI_LIBRARIES} ) +target_link_libraries(blinken ${KDE4_KIO_LIBS} \
${KDE4_PHONON_LIBS} kdeeduui )
install(TARGETS blinken ${INSTALL_TARGETS_DEFAULT_ARGS} )
--- trunk/KDE/kdeedu/blinken/src/blinken.cpp #1208652:1208653
@@ -28,7 +28,7 @@
#include "button.h"
#include "counter.h"
-#include <kedufontutils.h>
+#include "libkdeedu/kdeeduui/kedufontutils.h"
#include "number.h"
#include "highscoredialog.h"
#include "settings.h"
--- trunk/KDE/kdeedu/blinken/src/highscoredialog.cpp #1208652:1208653
@@ -19,7 +19,7 @@
#include <ktabwidget.h>
#include "counter.h"
-#include <kedufontutils.h>
+#include "libkdeedu/kdeeduui/kedufontutils.h"
#include "settings.h"
static const int margin = 15;
--- trunk/KDE/kdeedu/cantor/CMakeLists.txt #1208652:1208653
@@ -1,10 +1,5 @@
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.")
--- trunk/KDE/kdeedu/cantor/src/backends/octave/scripts/CMakeLists.txt \
#1208652:1208653 @@ -6,6 +6,6 @@
set(PLOT_FILE_SUFFIX png)
endif (WITH_EPS)
-configure_file(cantor_print.m.in ${CMAKE_CURRENT_BINARY_DIR}/cantor_print.m)
+configure_file(cantor_print.m.in 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} \
)
--- trunk/KDE/kdeedu/kanagram/CMakeLists.txt #1208652:1208653
@@ -1,13 +1,5 @@
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 )
--- trunk/KDE/kdeedu/kanagram/src/CMakeLists.txt #1208652:1208653
@@ -1,6 +1,7 @@
-include_directories( ${LIBKDEEDU_INCLUDE_DIR} )
+include_directories( ${CMAKE_SOURCE_DIR}/libkdeedu/keduvocdocument/ )
+
########### next target ###############
set(kanagram_SRCS
@@ -26,7 +27,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} ${LIBKDEEDU_KDEUVOCDOCUMENT_LIBRARIES} \
${LIBKDEEDU_KDEEDUUI_LIBRARIES} ) +target_link_libraries(kanagram \
${KDE4_KNEWSTUFF3_LIBS} ${KDE4_PHONON_LIBS} ${QT_QTXML_LIBRARY} keduvocdocument \
kdeeduui )
install(TARGETS kanagram ${INSTALL_TARGETS_DEFAULT_ARGS} )
--- trunk/KDE/kdeedu/kanagram/src/kanagram.cpp #1208652:1208653
@@ -51,7 +51,7 @@
#include "kanagramsettings.h"
#include "mainsettings.h"
#include "vocabsettings.h"
-#include <kedufontutils.h>
+#include "libkdeedu/kdeeduui/kedufontutils.h"
static const char* m_textRevealWord = I18N_NOOP("reveal word");
static const char* m_textHint = I18N_NOOP("hint");
--- trunk/KDE/kdeedu/khangman/CMakeLists.txt #1208652:1208653
@@ -1,13 +1,5 @@
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 )
--- trunk/KDE/kdeedu/khangman/src/CMakeLists.txt #1208652:1208653
@@ -1,5 +1,5 @@
-include_directories( ${LIBKDEEDU_INCLUDE_DIR} )
+include_directories( ${CMAKE_SOURCE_DIR}/libkdeedu/keduvocdocument )
########### next target ###############
@@ -24,7 +24,7 @@
kde4_add_executable(khangman ${khangman_SRCS})
add_dependencies(khangman kvtml_data)
-target_link_libraries(khangman ${LIBKDEEDU_KDEUVOCDOCUMENT_LIBRARIES} \
${KDE4_KIO_LIBS} ${KDE4_KNEWSTUFF3_LIBS} ${KDE4_PHONON_LIBS} ) \
+target_link_libraries(khangman keduvocdocument ${KDE4_KIO_LIBS} \
${KDE4_KNEWSTUFF3_LIBS} ${KDE4_PHONON_LIBS} )
install(TARGETS khangman ${INSTALL_TARGETS_DEFAULT_ARGS} )
--- trunk/KDE/kdeedu/khangman/src/main.cpp #1208652:1208653
@@ -45,9 +45,9 @@
// Write the names with accents and all and this file save with
// utf8 encoding.
aboutData.addAuthor(ki18n("Anne-Marie Mahfouf"), ki18n("Current maintainer, \
author"),
- "annma@kde.org", "http://annma.blogspot.com");
+ "annma@kde.org", "http://annma.blogspot.com", "annma");
aboutData.addCredit(ki18n("Stefan Böhmann"),
- ki18n("Coding help"), "kde@hilefoks.org", \
"http://www.hilefoks.org"); + ki18n("Coding help"), \
"kde@hilefoks.org", "http://www.hilefoks.org", "hilefoks"); \
aboutData.addCredit(ki18n("Stefan Asserhäll"),
ki18n("Swedish data files, coding help, transparent pictures \
and i18n fixes"), "stefan.asserhall@telia.com");
--- trunk/KDE/kdeedu/kwordquiz/CMakeLists.txt #1208652:1208653
@@ -1,12 +1,4 @@
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 )
--- trunk/KDE/kdeedu/kwordquiz/src/CMakeLists.txt #1208652:1208653
@@ -3,7 +3,7 @@
add_subdirectory( icons ) # global icons
add_subdirectory( examples )
-include_directories( ${LIBKDEEDU_INCLUDE_DIR} )
+include_directories( ${CMAKE_SOURCE_DIR}/libkdeedu/keduvocdocument )
########### next target ###############
@@ -65,7 +65,7 @@
kde4_add_executable(kwordquiz ${kwordquiz_SRCS})
-target_link_libraries(kwordquiz ${LIBKDEEDU_KDEUVOCDOCUMENT_LIBRARIES} \
${KDE4_KIO_LIBS} ${KDE4_KNEWSTUFF3_LIBS} ${KDE4_KNOTIFYCONFIG_LIBS} \
${KDE4_KUTILS_LIBS} ${KDE4_PHONON_LIBRARY}) +target_link_libraries(kwordquiz \
keduvocdocument ${KDE4_KIO_LIBS} ${KDE4_KNEWSTUFF3_LIBS} ${KDE4_KNOTIFYCONFIG_LIBS} \
${KDE4_KUTILS_LIBS} ${KDE4_PHONON_LIBRARY})
install(TARGETS kwordquiz ${INSTALL_TARGETS_DEFAULT_ARGS} )
--- trunk/KDE/kdeedu/libkdeedu/CMakeLists.txt #1208652:1208653
@@ -1,31 +1,10 @@
-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 )
--- trunk/KDE/kdeedu/libkdeedu/kdeeduui/CMakeLists.txt #1208652:1208653
@@ -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 EXPORT LibKdeEduTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS kdeeduui ${INSTALL_TARGETS_DEFAULT_ARGS})
########### install files ###############
--- trunk/KDE/kdeedu/libkdeedu/keduvocdocument/CMakeLists.txt #1208652:1208653
@@ -46,7 +46,7 @@
# SOVERSION ${LIB_KEDUVOCDOCUMENT_SOVERSION}
#)
-install(TARGETS keduvocdocument EXPORT LibKdeEduTargets \
${INSTALL_TARGETS_DEFAULT_ARGS}) +install(TARGETS keduvocdocument \
${INSTALL_TARGETS_DEFAULT_ARGS})
########### install files ###############
@@ -68,7 +68,5 @@
keduvocwordtype.h
keduvocpersonalpronoun.h
sharedkvtmlfiles.h
- keduvocdeclension.h
- keduvockvtml2writer.h
DESTINATION ${INCLUDE_INSTALL_DIR}/libkdeedu COMPONENT Devel
)
--- trunk/KDE/kdeedu/libkdeedu/keduvocdocument/tests/CMakeLists.txt #1208652:1208653
@@ -9,7 +9,7 @@
# CONVERTER:
-include_directories( .. )
+include_directories( ${CMAKE_SOURCE_DIR}/libkdeedu/keduvocdocument/ )
########### next target ###############
--- trunk/KDE/kdeedu/parley/CMakeLists.txt #1208652:1208653
@@ -1,14 +1,5 @@
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)
--- trunk/KDE/kdeedu/parley/plasmoid/CMakeLists.txt #1208652:1208653
@@ -1,7 +1,7 @@
project(plasma-parley)
add_subdirectory( engine )
-include_directories( ${LIBKDEEDU_INCLUDE_DIR} )
+include_directories( ${CMAKE_SOURCE_DIR}/libkdeedu/keduvocdocument/ )
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}
- ${LIBKDEEDU_KDEUVOCDOCUMENT_LIBRARIES}
+ keduvocdocument
)
install(
--- trunk/KDE/kdeedu/parley/plasmoid/engine/CMakeLists.txt #1208652:1208653
@@ -2,12 +2,12 @@
parley_engine.cpp
)
-include_directories( ${LIBKDEEDU_INCLUDE_DIR} )
+include_directories( ${CMAKE_SOURCE_DIR}/libkdeedu/keduvocdocument/ )
kde4_add_plugin(plasma_engine_parley ${parley_engine_SRCS})
target_link_libraries(plasma_engine_parley ${KDE4_KDECORE_LIBS}
plasma
- ${LIBKDEEDU_KDEUVOCDOCUMENT_LIBRARIES}
+ keduvocdocument
)
install(TARGETS plasma_engine_parley DESTINATION ${PLUGIN_INSTALL_DIR})
--- trunk/KDE/kdeedu/parley/src/CMakeLists.txt #1208652:1208653
@@ -4,7 +4,7 @@
add_subdirectory( settings )
# libkdeedu/keduvocdocument contains the library for reading and writing vocabulary \
files
-include_directories( ${LIBKDEEDU_INCLUDE_DIR} )
+include_directories( ${CMAKE_SOURCE_DIR}/libkdeedu/keduvocdocument/ )
set(parley_SRCS
main.cpp
@@ -164,7 +164,7 @@
target_link_libraries(
parley
- ${LIBKDEEDU_KDEUVOCDOCUMENT_LIBRARIES}
+ keduvocdocument
${KDE4_KHTML_LIBS}
${KDE4_KNEWSTUFF3_LIBS}
${KDE4_PHONON_LIBS}
--- trunk/KDE/kdeedu/parley/src/parleyactions.cpp #1208652:1208653
@@ -188,9 +188,7 @@
KAction* ParleyActions::createUploadAction(const QObject* recvr, const char* slot, \
KActionCollection* collection) {
- /*
KAction *pAction = KNS3::standardActionUpload(i18n("&Upload Vocabulary \
Document..."), recvr, slot, collection, "file_upload");
pAction->setHelpText(i18n("Share the current vocabulary collection with other \
users")); return pAction;
- */
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic