From: Carsten Niehaus <cniehaus@gmx.de>
Date: Mon, 27 Nov 2006 14:40:54 +0000 (+0000)
Subject: Wow, this commit looks huge :)
X-Git-Tag: v3.80.3~103
X-Git-Url: https://git.rmz.fi/?a=commitdiff_plain;h=4a9cb3915b91fa74c082ff9d6e52b6067e7deff0;p=libqmvoc.git

Wow, this commit looks huge :)

Technically I am just moving code from A to B. The 3D-Viewer is now
independend of Kalzium, I just need to rename the classes (from
Kalzium* to Compound* I think...). But I wanted to move the code itself
first.

svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=608413
---

4a9cb3915b91fa74c082ff9d6e52b6067e7deff0
diff --cc libscience/CMakeLists.txt
index 576a50c,0000000..eedd9f0
mode 100644,000000..100644
--- a/libscience/CMakeLists.txt
+++ b/libscience/CMakeLists.txt
@@@ -1,30 -1,0 +1,31 @@@
 +add_subdirectory(data)
++add_subdirectory(compoundviewer)
 +
 +#comment these lines out if you don't want to build the test
 +set(parsertest_SRCS xmlreadingtest.cpp)
 +kde4_add_executable(parsertest ${parsertest_SRCS})
 +target_link_libraries(parsertest science)
 +#end tests
 +
 +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})
 +
 +kde4_add_library(science SHARED ${science_LIB_SRCS})
 +
 +target_link_libraries(science  ${KDE4_KDEUI_LIBS} ${QT_QTXML_LIBRARY} )
 +
 +set_target_properties(science PROPERTIES VERSION 4.0.0 SOVERSION 4 )
 +install(TARGETS science  DESTINATION ${LIB_INSTALL_DIR} )
 +
diff --cc libscience/compoundviewer/CMakeLists.txt
index 0000000,0000000..9cdb1e6
new file mode 100644
--- /dev/null
+++ b/libscience/compoundviewer/CMakeLists.txt
@@@ -1,0 -1,0 +1,26 @@@
++include_directories(
++   ${CMAKE_SOURCE_DIR}/..
++   ${CMAKE_CURRENT_BINARY_DIR}/..
++)
++
++if(OPENBABEL2_FOUND AND OPENGL_FOUND AND EIGEN_FOUND)
++  set( compoundviewer_SRCS
++    kalziumglhelperclasses.cpp
++    kalziumglwidget.cpp
++    openbabel2wrapper.cpp
++    kalziumglpart.cpp
++    )
++  include_directories( ${OPENBABEL2_INCLUDE_DIR} )
++
++  kde4_automoc(${compoundviewer_SRCS})
++  add_subdirectory(widgets)
++endif(OPENBABEL2_FOUND AND OPENGL_FOUND AND EIGEN_FOUND)
++
++kde4_add_library(compoundviewer SHARED ${compoundviewer_SRCS})
++
++target_link_libraries(compoundviewer ${OPENBABEL2_LIBRARIES} ${QT_QTOPENGL_LIBRARY} ${KDE4_KPARTS_LIBS} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} )
++
++set_target_properties(compoundviewer PROPERTIES VERSION 4.0.0 SOVERSION 4 )
++
++install(TARGETS compoundviewer  DESTINATION ${LIB_INSTALL_DIR} )
++
diff --cc libscience/compoundviewer/kalziumgl_part.desktop
index 0000000,c2dda42..c2dda42
mode 000000,100644..100644
--- a/libscience/compoundviewer/kalziumgl_part.desktop
+++ b/libscience/compoundviewer/kalziumgl_part.desktop
diff --cc libscience/compoundviewer/kalziumglhelperclasses.cpp
index 0000000,f7af456..f7af456
mode 000000,100644..100644
--- a/libscience/compoundviewer/kalziumglhelperclasses.cpp
+++ b/libscience/compoundviewer/kalziumglhelperclasses.cpp
diff --cc libscience/compoundviewer/kalziumglhelperclasses.h
index 0000000,f736fbb..f736fbb
mode 000000,100644..100644
--- a/libscience/compoundviewer/kalziumglhelperclasses.h
+++ b/libscience/compoundviewer/kalziumglhelperclasses.h
diff --cc libscience/compoundviewer/kalziumglpart.cpp
index 0000000,009eed1..009eed1
mode 000000,100644..100644
--- a/libscience/compoundviewer/kalziumglpart.cpp
+++ b/libscience/compoundviewer/kalziumglpart.cpp
diff --cc libscience/compoundviewer/kalziumglpart.h
index 0000000,246da6f..246da6f
mode 000000,100644..100644
--- a/libscience/compoundviewer/kalziumglpart.h
+++ b/libscience/compoundviewer/kalziumglpart.h
diff --cc libscience/compoundviewer/kalziumglwidget.cpp
index 0000000,9d7b59d..9d7b59d
mode 000000,100644..100644
--- a/libscience/compoundviewer/kalziumglwidget.cpp
+++ b/libscience/compoundviewer/kalziumglwidget.cpp
diff --cc libscience/compoundviewer/kalziumglwidget.h
index 0000000,cdc5255..cdc5255
mode 000000,100644..100644
--- a/libscience/compoundviewer/kalziumglwidget.h
+++ b/libscience/compoundviewer/kalziumglwidget.h
diff --cc libscience/compoundviewer/openbabel2wrapper.cpp
index 0000000,879058b..879058b
mode 000000,100644..100644
--- a/libscience/compoundviewer/openbabel2wrapper.cpp
+++ b/libscience/compoundviewer/openbabel2wrapper.cpp
diff --cc libscience/compoundviewer/openbabel2wrapper.h
index 0000000,8f46ddd..8f46ddd
mode 000000,100644..100644
--- a/libscience/compoundviewer/openbabel2wrapper.h
+++ b/libscience/compoundviewer/openbabel2wrapper.h
diff --cc libscience/compoundviewer/widgets/CMakeLists.txt
index 0000000,4b2768a..c7b6490
mode 000000,100644..100644
--- a/libscience/compoundviewer/widgets/CMakeLists.txt
+++ b/libscience/compoundviewer/widgets/CMakeLists.txt
@@@ -1,0 -1,24 +1,22 @@@
+ include_directories(
 -   ${CMAKE_SOURCE_DIR}/kalzium/src
 -   ${CMAKE_BINARY_DIR}/kalzium/src
++   ${CMAKE_SOURCE_DIR}/..
++   ${CMAKE_CURRENT_BINARY_DIR}/..
++   ${CMAKE_CURRENT_SOURCE_DIR}/..
+ )
+ if(OPENBABEL2_FOUND)
 -	include_directories( ${OPENBABEL2_INCLUDE_DIR} )
++	include_directories( ${OPENBABEL2_INCLUDE_DIR} ..)
+ endif(OPENBABEL2_FOUND)
+ 
+ set(kalziumui_PART_SRCS 
 -   ${CMAKE_SOURCE_DIR}/kalzium/src/kalziumglhelperclasses.cpp
 -   ${CMAKE_SOURCE_DIR}/kalzium/src/kalziumglwidget.cpp
++   ${CMAKE_CURRENT_SOURCE_DIR}/../kalziumglwidget.cpp
++   ${CMAKE_CURRENT_SOURCE_DIR}/../kalziumglhelperclasses.cpp
+    )
+ 
+ KDE4_ADD_WIDGET_FILES(kalziumui_PART_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/kalziumui.widgets)
+ 
 -
+ kde4_add_plugin(kalziumuiwidgets ${kalziumui_PART_SRCS})
+ 
 -
 -
 -target_link_libraries(kalziumuiwidgets ${OPENBABEL2_LIBRARIES} ${QT_QTOPENGL_LIBRARY} ${QT_QTDESIGNER_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDEUI_LIBS} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY})
++target_link_libraries(kalziumuiwidgets ${OPENBABEL2_LIBRARIES} ${QT_QTOPENGL_LIBRARY} ${QT_QTDESIGNER_LIBRARY} ${KDE4_KDEUI_LIBS} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY})
+ 
+ install(TARGETS kalziumuiwidgets DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer )
+ 
diff --cc libscience/compoundviewer/widgets/kalziumui.widgets
index 0000000,bcd0f76..bcd0f76
mode 000000,100644..100644
--- a/libscience/compoundviewer/widgets/kalziumui.widgets
+++ b/libscience/compoundviewer/widgets/kalziumui.widgets