[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdeedu
From: Etienne Rebetez <etienne.rebetez () oberwallis ! ch>
Date: 2010-12-23 18:17:14
Message-ID: 20101223181714.C74AB3E1F1 () svn ! kde ! org
[Download RAW message or body]
SVN commit 1208940 by erebetez:
moving libscience to kalzium.
kalzium can be build alone.
kalzium is git ready;)
M +26 -0 kalzium/CMakeLists.txt
A kalzium/cmake (directory)
A kalzium/cmake/CMakeLists.txt
A kalzium/cmake/modules (directory)
A kalzium/cmake/modules/CMakeLists.txt
A kalzium/cmake/modules/COPYING-CMAKE-SCRIPTS
A kalzium/cmake/modules/FindEigen2.cmake
A kalzium/cmake/modules/FindKDEEdu.cmake
A kalzium/cmake/modules/FindLibSpectre.cmake
A kalzium/cmake/modules/FindLibfacile.cmake
A kalzium/cmake/modules/FindOCaml.cmake
A kalzium/cmake/modules/FindOpenBabel2.cmake
A kalzium/libscience (directory)
A kalzium/libscience/CMakeLists.txt \
libkdeedu/libscience/CMakeLists.txt#1208918 A \
kalzium/libscience/Mainpage.dox libkdeedu/libscience/Mainpage.dox#1208918 A \
kalzium/libscience/chemicaldataobject.cpp \
libkdeedu/libscience/chemicaldataobject.cpp#1208918 [License: GPL (v2+)] A \
kalzium/libscience/chemicaldataobject.h \
libkdeedu/libscience/chemicaldataobject.h#1208918 [License: GPL (v2+)] A \
kalzium/libscience/data (directory) A \
kalzium/libscience/data/CMakeLists.txt \
libkdeedu/libscience/data/CMakeLists.txt#1208918 A \
kalzium/libscience/data/elements.xml libkdeedu/libscience/data/elements.xml#1208918 \
A kalzium/libscience/data/isotopes.xml \
libkdeedu/libscience/data/isotopes.xml#1208918 A \
kalzium/libscience/data/spectra.xml libkdeedu/libscience/data/spectra.xml#1208918 \
A kalzium/libscience/data/symbols.csv \
libkdeedu/libscience/data/symbols.csv#1208918 A \
kalzium/libscience/data/symbols2.csv libkdeedu/libscience/data/symbols2.csv#1208918 \
A kalzium/libscience/element.cpp \
libkdeedu/libscience/element.cpp#1208918 [License: GPL (v2+)] A \
kalzium/libscience/element.h libkdeedu/libscience/element.h#1208918 [License: GPL \
(v2+)] A kalzium/libscience/elementparser.cpp \
libkdeedu/libscience/elementparser.cpp#1208918 [License: GPL (v2+)] A \
kalzium/libscience/elementparser.h libkdeedu/libscience/elementparser.h#1208918 \
[License: GPL (v2+)] A kalzium/libscience/isotope.cpp \
libkdeedu/libscience/isotope.cpp#1208918 [License: GPL (v2+)] A \
kalzium/libscience/isotope.h libkdeedu/libscience/isotope.h#1208918 [License: GPL \
(v2+)] A kalzium/libscience/isotopeparser.cpp \
libkdeedu/libscience/isotopeparser.cpp#1208918 [License: GPL (v2+)] A \
kalzium/libscience/isotopeparser.h libkdeedu/libscience/isotopeparser.h#1208918 \
[License: GPL (v2+)] A kalzium/libscience/libkdeedu_science_export.h \
libkdeedu/libscience/libkdeedu_science_export.h#1208918 [License: LGPL (v2+)] A \
kalzium/libscience/moleculeparser.cpp \
libkdeedu/libscience/moleculeparser.cpp#1208918 [License: GPL (v2+)] A \
kalzium/libscience/moleculeparser.h libkdeedu/libscience/moleculeparser.h#1208918 \
[License: GPL (v2+)] A kalzium/libscience/parser.cpp \
libkdeedu/libscience/parser.cpp#1208918 [License: GENERATED FILE] A \
kalzium/libscience/parser.h libkdeedu/libscience/parser.h#1208918 [License: GPL \
(v2+)] A kalzium/libscience/psetables.cpp \
libkdeedu/libscience/psetables.cpp#1208918 [License: GPL (v2+)] A \
kalzium/libscience/psetables.h libkdeedu/libscience/psetables.h#1208918 [License: \
GPL (v2+)] A kalzium/libscience/spectrum.cpp \
libkdeedu/libscience/spectrum.cpp#1208918 [License: GPL (v2+)] A \
kalzium/libscience/spectrum.h libkdeedu/libscience/spectrum.h#1208918 [License: GPL \
(v2+)] A kalzium/libscience/spectrumparser.cpp \
libkdeedu/libscience/spectrumparser.cpp#1208918 [License: GPL (v2+)] A \
kalzium/libscience/spectrumparser.h libkdeedu/libscience/spectrumparser.h#1208918 \
[License: GPL (v2+)] A kalzium/libscience/tempunit.cpp \
libkdeedu/libscience/tempunit.cpp#1208918 [License: GPL (v2+)] A \
kalzium/libscience/tempunit.h libkdeedu/libscience/tempunit.h#1208918 [License: GPL \
(v2+)] A kalzium/libscience/tests (directory)
A kalzium/libscience/tests/CMakeLists.txt \
libkdeedu/libscience/tests/CMakeLists.txt#1208918 A \
kalzium/libscience/tests/isotopereadingtest.cpp \
libkdeedu/libscience/tests/isotopereadingtest.cpp#1208918 [License: GPL (v2+)] A \
kalzium/libscience/tests/spectrumreadingtests.cpp \
libkdeedu/libscience/tests/spectrumreadingtests.cpp#1208918 [License: GPL (v2+)] A \
kalzium/libscience/tests/xmlreadingtest.cpp \
libkdeedu/libscience/tests/xmlreadingtest.cpp#1208918 [License: GPL (v2+)] M +0 -1 \
libkdeedu/CMakeLists.txt D libkdeedu/libscience/CMakeLists.txt
D libkdeedu/libscience/Mainpage.dox
D libkdeedu/libscience/chemicaldataobject.cpp
D libkdeedu/libscience/chemicaldataobject.h
D libkdeedu/libscience/data/CMakeLists.txt
D libkdeedu/libscience/data/elements.xml
D libkdeedu/libscience/data/isotopes.xml
D libkdeedu/libscience/data/spectra.xml
D libkdeedu/libscience/data/symbols.csv
D libkdeedu/libscience/data/symbols2.csv
D libkdeedu/libscience/element.cpp
D libkdeedu/libscience/element.h
D libkdeedu/libscience/elementparser.cpp
D libkdeedu/libscience/elementparser.h
D libkdeedu/libscience/isotope.cpp
D libkdeedu/libscience/isotope.h
D libkdeedu/libscience/isotopeparser.cpp
D libkdeedu/libscience/isotopeparser.h
D libkdeedu/libscience/libkdeedu_science_export.h
D libkdeedu/libscience/moleculeparser.cpp
D libkdeedu/libscience/moleculeparser.h
D libkdeedu/libscience/parser.cpp
D libkdeedu/libscience/parser.h
D libkdeedu/libscience/psetables.cpp
D libkdeedu/libscience/psetables.h
D libkdeedu/libscience/spectrum.cpp
D libkdeedu/libscience/spectrum.h
D libkdeedu/libscience/spectrumparser.cpp
D libkdeedu/libscience/spectrumparser.h
D libkdeedu/libscience/tempunit.cpp
D libkdeedu/libscience/tempunit.h
D libkdeedu/libscience/tests/CMakeLists.txt
D libkdeedu/libscience/tests/isotopereadingtest.cpp
D libkdeedu/libscience/tests/spectrumreadingtests.cpp
D libkdeedu/libscience/tests/xmlreadingtest.cpp
--- trunk/KDE/kdeedu/kalzium/CMakeLists.txt #1208939:1208940
@@ -1,5 +1,30 @@
project(kalzium)
+set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules )
+
+# search packages used by KDE
+find_package(KDE4 4.3.80 REQUIRED)
+if(WIN32)
+ find_package(KDEWIN32 REQUIRED)
+ # detect oxygen icon dir at configure time based on KDEDIRS - there may be \
different package installation locations + execute_process(COMMAND \
"${KDE4_KDECONFIG_EXECUTABLE}" --path icon OUTPUT_VARIABLE _dir ERROR_QUIET \
OUTPUT_STRIP_TRAILING_WHITESPACE) + file(TO_CMAKE_PATH "${_dir}" __dir)
+ find_path(KDE4_ICON_DIR oxygen PATHS
+ ${__dir}
+ )
+ message(STATUS "using oxygen application icons from ${KDE4_ICON_DIR}")
+else(WIN32)
+ set (KDE4_ICON_DIR ${CMAKE_INSTALL_PREFIX}/share/icons)
+endif(WIN32)
+
+include(KDE4Defaults)
+include(MacroLibrary)
+include(MacroOptionalAddSubdirectory)
+include(MacroBoolTo01)
+
+add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
+include_directories (${QDBUS_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} \
${KDE4_INCLUDES} libscience) +
kde4_no_enable_final(kalzium)
include(KalziumConfigureChecks.cmake)
@@ -19,3 +44,4 @@
add_subdirectory(src)
add_subdirectory(data)
add_subdirectory(plasmoid)
+add_subdirectory(libscience)
\ No newline at end of file
--- trunk/KDE/kdeedu/libkdeedu/CMakeLists.txt #1208939:1208940
@@ -4,7 +4,6 @@
add_subdirectory(keduvocdocument)
add_subdirectory(kdeeduui)
-add_subdirectory(libscience)
#add_subdirectory(widgets)
add_subdirectory(qtmmlwidget)
add_subdirectory(icons)
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic