From ac5b088b03d55f1607b7ad991e167c7196eb6d45 Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Mon, 10 Apr 2006 21:47:32 +0000 Subject: [PATCH] SVN_SILENT indent and cleanup svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=528382 --- CMakeLists.txt | 22 ++++---------- kdeeducore/CMakeLists.txt | 52 +++++++++++++++++++++++----------- kdeeduplot/CMakeLists.txt | 21 ++++++++++---- kdeeduui/CMakeLists.txt | 19 +++++++++---- libscience/CMakeLists.txt | 36 ++++++++++++----------- libscience/data/CMakeLists.txt | 12 +++----- widgets/CMakeLists.txt | 15 +++++++--- 7 files changed, 105 insertions(+), 72 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ad67381..db9e6f1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,25 +1,15 @@ kde4_header() project(libkdeedu) -add_subdirectory( kdeeducore ) -add_subdirectory( kdeeduui ) -add_subdirectory( kdeeduplot ) -add_subdirectory( extdate ) -add_subdirectory( libscience ) -add_subdirectory( widgets ) - -include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) - - -########### install files ############### - - -kde4_create_doxygen_docs( ) +add_subdirectory(kdeeducore) +add_subdirectory(kdeeduui) +add_subdirectory(kdeeduplot) +add_subdirectory(extdate) +add_subdirectory(libscience) +add_subdirectory(widgets) kde4_footer() - - #original Makefile.am contents follow: #SUBDIRS = kdeeducore kdeeduui kdeeduplot extdate libscience widgets diff --git a/kdeeducore/CMakeLists.txt b/kdeeducore/CMakeLists.txt index 20e193a..bfbcfd8 100644 --- a/kdeeducore/CMakeLists.txt +++ b/kdeeducore/CMakeLists.txt @@ -1,27 +1,34 @@ kde4_header() -include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) +include_directories( + ${KDE4_INCLUDE_DIR} + ${QT_INCLUDES} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} +) ########### next target ############### -set(kdeeducore_LIB_SRCS - keduvocdocument.cpp - keduvocexpression.cpp - keduvocgrammar.cpp - keduvockvtmlreader.cpp - keduvockvtmlwriter.cpp - keduvocmultiplechoice.cpp - keduvowqlreader.cpp - keduvowqlwriter.cpp - leitnerbox.cpp - leitnersystem.cpp - leitnersystemview.cpp +set(kdeeducore_LIB_SRCS + keduvocdocument.cpp + keduvocexpression.cpp + keduvocgrammar.cpp + keduvockvtmlreader.cpp + keduvockvtmlwriter.cpp + keduvocmultiplechoice.cpp + keduvowqlreader.cpp + keduvowqlwriter.cpp + leitnerbox.cpp + leitnersystem.cpp + leitnersystemview.cpp prefleitner.cpp ) kde4_automoc(${kdeeducore_LIB_SRCS}) -kde4_add_ui_files(kdeeducore_LIB_SRCS prefleitnerbase.ui ) +kde4_add_ui_files(kdeeducore_LIB_SRCS + prefleitnerbase.ui +) kde4_add_library(kdeeducore SHARED ${kdeeducore_LIB_SRCS}) @@ -33,12 +40,23 @@ install_targets(${LIB_INSTALL_DIR} kdeeducore ) ########### install files ############### -install_files( /include/libkdeedu FILES keduvocdocument.h keduvocexpression.h keduvocgrammar.h keduvockvtmlreader.h keduvockvtmlwriter.h keduvocmultiplechoice.h keduvowqlreader.h keduvowqlwriter.h leitnerbox.h leitnersystem.h leitnersystemview.h prefleitner.h ) +install_files(/include/libkdeedu FILES + keduvocdocument.h + keduvocexpression.h + keduvocgrammar.h + keduvockvtmlreader.h + keduvockvtmlwriter.h + keduvocmultiplechoice.h + keduvowqlreader.h + keduvowqlwriter.h + leitnerbox.h + leitnersystem.h + leitnersystemview.h + prefleitner.h +) kde4_footer() - - #original Makefile.am contents follow: #INCLUDES = $(all_includes) diff --git a/kdeeduplot/CMakeLists.txt b/kdeeduplot/CMakeLists.txt index 46a0cb2..d4652c5 100644 --- a/kdeeduplot/CMakeLists.txt +++ b/kdeeduplot/CMakeLists.txt @@ -1,11 +1,20 @@ kde4_header() -include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) +include_directories( + ${KDE4_INCLUDE_DIR} + ${QT_INCLUDES} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} +) ########### next target ############### -set(kdeeduplot_LIB_SRCS kplotobject.cpp kplotaxis.cpp kplotwidget.cpp ) +set(kdeeduplot_LIB_SRCS + kplotobject.cpp + kplotaxis.cpp + kplotwidget.cpp +) kde4_automoc(${kdeeduplot_LIB_SRCS}) @@ -19,12 +28,14 @@ install_targets(${LIB_INSTALL_DIR} kdeeduplot ) ########### install files ############### -install_files( /include/libkdeedu FILES kplotobject.h kplotaxis.h kplotwidget.h ) +install_files(/include/libkdeedu FILES + kplotobject.h + kplotaxis.h + kplotwidget.h +) kde4_footer() - - #original Makefile.am contents follow: #INCLUDES= $(all_includes) diff --git a/kdeeduui/CMakeLists.txt b/kdeeduui/CMakeLists.txt index fa358b3..ec958ac 100644 --- a/kdeeduui/CMakeLists.txt +++ b/kdeeduui/CMakeLists.txt @@ -1,13 +1,20 @@ kde4_header() -add_subdirectory( tests ) +#add_subdirectory(tests) -include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) +include_directories( + ${KDE4_INCLUDE_DIR} + ${QT_INCLUDES} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} +) ########### next target ############### -set(kdeeduui_LIB_SRCS kdeeduglossary.cpp ) +set(kdeeduui_LIB_SRCS + kdeeduglossary.cpp +) kde4_automoc(${kdeeduui_LIB_SRCS}) @@ -21,12 +28,12 @@ install_targets(${LIB_INSTALL_DIR} kdeeduui ) ########### install files ############### -install_files( /include/libkdeedu FILES kdeeduglossary.h ) +install_files(/include/libkdeedu FILES + kdeeduglossary.h +) kde4_footer() - - #original Makefile.am contents follow: #INCLUDES= $(all_includes) diff --git a/libscience/CMakeLists.txt b/libscience/CMakeLists.txt index b620755..6cb27af 100644 --- a/libscience/CMakeLists.txt +++ b/libscience/CMakeLists.txt @@ -1,24 +1,30 @@ kde4_header() -add_subdirectory( data ) -add_subdirectory( tests ) +add_subdirectory(data) +add_subdirectory(tests) -include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) +include_directories( + ${KDE4_INCLUDE_DIR} + ${QT_INCLUDES} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} +) ########### next target ############### -set(science_LIB_SRCS - element.cpp - spectrum.cpp - isotope.cpp - spectrumparser.cpp - elementparser.cpp - isotopeparser.cpp - tempunit.cpp - chemicaldataobject.cpp - moleculeparser.cpp - parser.cpp ) +set(science_LIB_SRCS + element.cpp + spectrum.cpp + isotope.cpp + spectrumparser.cpp + elementparser.cpp + isotopeparser.cpp + tempunit.cpp + chemicaldataobject.cpp + moleculeparser.cpp + parser.cpp +) kde4_automoc(${science_LIB_SRCS}) @@ -35,8 +41,6 @@ install_targets(${LIB_INSTALL_DIR} science ) kde4_footer() - - #original Makefile.am contents follow: #SUBDIRS = . data tests diff --git a/libscience/data/CMakeLists.txt b/libscience/data/CMakeLists.txt index 4f11ad4..32d9761 100644 --- a/libscience/data/CMakeLists.txt +++ b/libscience/data/CMakeLists.txt @@ -1,16 +1,12 @@ kde4_header() -include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) - - -########### install files ############### - -install_files( ${DATA_INSTALL_DIR}/libkdeedu/data/ FILES elements.xml isotopes.xml ) +install_files(${DATA_INSTALL_DIR}/libkdeedu/data/ FILES + elements.xml + isotopes.xml +) kde4_footer() - - #original Makefile.am contents follow: #xml_DATA = elements.xml isotopes.xml diff --git a/widgets/CMakeLists.txt b/widgets/CMakeLists.txt index 7126d56..cc335ef 100644 --- a/widgets/CMakeLists.txt +++ b/widgets/CMakeLists.txt @@ -1,6 +1,13 @@ kde4_header() -include_directories(${CMAKE_SOURCE_DIR}/libkdeedu/kdeeduplot/ ${CMAKE_SOURCE_DIR}/libkdeedu/extdate/ ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) +include_directories( + ${KDE4_INCLUDE_DIR} + ${QT_INCLUDES} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_SOURCE_DIR}/libkdeedu/kdeeduplot/ + ${CMAKE_SOURCE_DIR}/libkdeedu/extdate/ +) add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kdeeduwidgets.cpp COMMAND ${CMAKE_INSTALL_PREFIX}/bin/makekdewidgets @@ -9,7 +16,9 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kdeeduwidgets.cpp ########### next target ############### -set(kdeeduwidgets_PART_SRCS kdeeduwidgets.cpp ) +set(kdeeduwidgets_PART_SRCS + kdeeduwidgets.cpp +) qt4_generate_moc(${CMAKE_CURRENT_BINARY_DIR}/kdeeduwidgets.cpp ${CMAKE_CURRENT_BINARY_DIR}/kdeeduwidgets.moc) @@ -27,8 +36,6 @@ install_targets(${LIB_INSTALL_DIR}/kde4 kdeeduwidgets ) kde4_footer() - - #original Makefile.am contents follow: #INCLUDES = -I$(srcdir)/../kdeeduplot $(all_includes) -- 2.47.3