From 3a3994306126251f1e3ca55d4190cfa6568eacd5 Mon Sep 17 00:00:00 2001 From: Carsten Niehaus Date: Sat, 29 Mar 2008 19:12:04 +0100 Subject: [PATCH] Trying to build.... Need to port back kde4 related patches to our buildsystem --- kalzium/libavogadro-kalzium/src/CMakeLists.txt | 7 - .../libavogadro-kalzium/src/engines/CMakeLists.txt | 208 +++++++-------------- kalzium/libavogadro-kalzium/src/global.cpp | 4 +- 3 files changed, 67 insertions(+), 152 deletions(-) rewrite kalzium/libavogadro-kalzium/src/engines/CMakeLists.txt (77%) diff --git a/kalzium/libavogadro-kalzium/src/CMakeLists.txt b/kalzium/libavogadro-kalzium/src/CMakeLists.txt index 2a59147..a51485d 100644 --- a/kalzium/libavogadro-kalzium/src/CMakeLists.txt +++ b/kalzium/libavogadro-kalzium/src/CMakeLists.txt @@ -21,13 +21,6 @@ FILE(GLOB libavogadro_HDRS "*.h") qt4_automoc(${libavogadro_SRCS}) -SET(libavogadro_TS - ${CMAKE_SOURCE_DIR}/i18n/avogadro_de.ts - ${CMAKE_SOURCE_DIR}/i18n/avogadro_fr.ts - ${CMAKE_SOURCE_DIR}/i18n/avogadro_en_GB.ts -) -QT4_WRAP_TS(libavogadro_QM ${libavogadro_TS}) - KDE4_ADD_LIBRARY(avogadro-kalzium SHARED ${libavogadro_SRCS}) SET_TARGET_PROPERTIES(avogadro-kalzium PROPERTIES OUTPUT_NAME avogadro-kalzium) set_target_properties(avogadro-kalzium PROPERTIES VERSION 0.6.1 SOVERSION 0 ) diff --git a/kalzium/libavogadro-kalzium/src/engines/CMakeLists.txt b/kalzium/libavogadro-kalzium/src/engines/CMakeLists.txt dissimilarity index 77% index 711daf7..45ec096 100644 --- a/kalzium/libavogadro-kalzium/src/engines/CMakeLists.txt +++ b/kalzium/libavogadro-kalzium/src/engines/CMakeLists.txt @@ -1,143 +1,65 @@ -set(QT_USE_QTOPENGL true) - -include(${QT_USE_FILE}) - -include_directories(${OPENBABEL_INCLUDE_DIR} - ${CMAKE_CURRENT_BINARY_DIR} -) - -set(DESTINATION_DIR ${LIB_INSTALL_DIR}/avogadro/engines) - -ADD_DEFINITIONS(${QT_DEFINITIONS}) -ADD_DEFINITIONS(-DQT_PLUGIN) -ADD_DEFINITIONS(-DQT_NO_DEBUG) -ADD_DEFINITIONS(-DQT_SHARED) - -link_directories(${CMAKE_CURRENT_BINARY_DIR}/..) - -# ball and stick dynamic engine -set(bsdyengine_SRCS bsdyengine.cpp) -qt4_wrap_ui(bsdyengine_UIS bsdysettingswidget.ui) -qt4_automoc(${bsdyengine_SRCS}) -ADD_LIBRARY(bsdyengine SHARED ${bsdyengine_SRCS} ${bsdyengine_UIS}) -TARGET_LINK_LIBRARIES(bsdyengine avogadro-lib - ${OPENBABEL2_LIBRARIES} ${QT_LIBRARIES} - ${OPENGL_LIBRARIES} -) - -INSTALL(TARGETS bsdyengine DESTINATION ${DESTINATION_DIR}) - -# label engine -set(labelengine_SRCS labelengine.cpp) -qt4_wrap_ui(labelengine_UIS labelsettingswidget.ui) -qt4_automoc(${labelengine_SRCS}) -ADD_LIBRARY(labelengine SHARED ${labelengine_SRCS} ${labelengine_UIS} ) -TARGET_LINK_LIBRARIES(labelengine avogadro-lib - ${OPENBABEL2_LIBRARIES} ${QT_LIBRARIES} - ${OPENGL_LIBRARIES} -) -INSTALL(TARGETS labelengine DESTINATION ${DESTINATION_DIR}) - -# wireframe -set(wireengine_SRCS wireengine.cpp) -qt4_automoc(${wireengine_SRCS}) -qt4_wrap_ui(wireengine_UIS wiresettingswidget.ui) -ADD_LIBRARY(wireengine SHARED ${wireengine_SRCS} ${wireengine_UIS}) -TARGET_LINK_LIBRARIES(wireengine avogadro-lib - ${OPENBABEL2_LIBRARIES} ${QT_LIBRARIES} - ${OPENGL_LIBRARIES} -) -INSTALL(TARGETS wireengine DESTINATION ${DESTINATION_DIR}) - -# hydrogen bond -set(hbondengine_SRCS hbondengine.cpp) -qt4_automoc(${hbondengine_SRCS}) -qt4_wrap_ui(hbondengine_UIS hbondsettingswidget.ui) -ADD_LIBRARY(hbondengine SHARED ${hbondengine_SRCS} ${hbondengine_UIS}) -TARGET_LINK_LIBRARIES(hbondengine avogadro-lib - ${OPENBABEL2_LIBRARIES} ${QT_LIBRARIES} - ${OPENGL_LIBRARIES} -) -INSTALL(TARGETS hbondengine DESTINATION ${DESTINATION_DIR}) - -# sphere -set(sphereengine_SRCS sphereengine.cpp) -qt4_wrap_ui(sphereengine_UIS spheresettingswidget.ui) -qt4_automoc(${sphereengine_SRCS}) -ADD_LIBRARY(sphereengine SHARED ${sphereengine_SRCS} ${sphereengine_UIS} ) -TARGET_LINK_LIBRARIES(sphereengine avogadro-lib - ${OPENBABEL2_LIBRARIES} ${QT_LIBRARIES} - ${OPENGL_LIBRARIES} -) - -INSTALL(TARGETS sphereengine DESTINATION ${DESTINATION_DIR}) - -# stick (cylinder) engine -set(stickengine_SRCS stickengine.cpp) -qt4_automoc(${stickengine_SRCS}) -ADD_LIBRARY(stickengine SHARED ${stickengine_SRCS} ) -TARGET_LINK_LIBRARIES(stickengine avogadro-lib - ${OPENBABEL2_LIBRARIES} ${QT_LIBRARIES} - ${OPENGL_LIBRARIES} -) - -INSTALL(TARGETS stickengine DESTINATION ${DESTINATION_DIR}) - -# Ribbon engine (biological structure) -set(ribbonengine_SRCS ribbonengine.cpp) -qt4_wrap_ui(ribbonengine_UIS ribbonsettingswidget.ui) -qt4_automoc(${ribbonengine_SRCS}) -ADD_LIBRARY(ribbonengine SHARED ${ribbonengine_SRCS} ${ribbonengine_UIS} ) -TARGET_LINK_LIBRARIES(ribbonengine avogadro-lib - ${OPENBABEL2_LIBRARIES} ${QT_LIBRARIES} - ${OPENGL_LIBRARIES} -) - -INSTALL(TARGETS ribbonengine DESTINATION ${DESTINATION_DIR}) - -# Ring engine - display cyclic rings -set(ringengine_SRCS ringengine.cpp) -qt4_wrap_ui(ringengine_UIS ringsettingswidget.ui) -qt4_automoc(${ringengine_SRCS}) -ADD_LIBRARY(ringengine SHARED ${ringengine_SRCS} ${ringengine_UIS} ) -TARGET_LINK_LIBRARIES(ringengine avogadro-lib - ${OPENBABEL2_LIBRARIES} ${QT_LIBRARIES} - ${OPENGL_LIBRARIES} -) - -INSTALL(TARGETS ringengine DESTINATION ${DESTINATION_DIR}) - -# Polygon engine -set(polygonengine_SRCS polygonengine.cpp) -qt4_automoc(${polygonengine_SRCS}) -ADD_LIBRARY(polygonengine SHARED ${polygonengine_SRCS} ) -TARGET_LINK_LIBRARIES(polygonengine avogadro-lib - ${OPENBABEL2_LIBRARIES} ${QT_LIBRARIES} - ${OPENGL_LIBRARIES} -) - -INSTALL(TARGETS polygonengine DESTINATION ${DESTINATION_DIR}) - -# Surface engine - molecular surfaces and 3D functions -set(surfaceengine_SRCS iso.cpp surfaceengine.cpp) -qt4_wrap_ui(surfaceengine_UIS surfacesettingswidget.ui) -qt4_automoc(${surfaceengine_SRCS}) -ADD_LIBRARY(surfaceengine SHARED ${surfaceengine_SRCS} ${surfaceengine_UIS}) -TARGET_LINK_LIBRARIES(surfaceengine avogadro-lib - ${OPENBABEL2_LIBRARIES} ${QT_LIBRARIES} - ${OPENGL_LIBRARIES} -) - -INSTALL(TARGETS surfaceengine DESTINATION ${DESTINATION_DIR}) - -# Orbital engine - molecular orbitals -set(orbitalengine_SRCS iso.cpp orbitalengine.cpp) -qt4_wrap_ui(orbitalengine_UIS orbitalsettingswidget.ui) -qt4_automoc(${orbitalengine_SRCS}) -ADD_LIBRARY(orbitalengine SHARED ${orbitalengine_SRCS} ${orbitalengine_UIS}) -TARGET_LINK_LIBRARIES(orbitalengine avogadro-lib - ${OPENBABEL2_LIBRARIES} ${QT_LIBRARIES} - ${OPENGL_LIBRARIES} -) - -INSTALL(TARGETS orbitalengine DESTINATION ${DESTINATION_DIR}) +set(QT_USE_QTOPENGL true) + +include(${QT_USE_FILE}) + +include_directories(${OPENBABEL_INCLUDE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} +) + +# Install to avogadro-kalzium so as not to collide with avogadro. +set(DESTINATION_DIR ${LIB_INSTALL_DIR}/avogadro-kalzium/engines) + +ADD_DEFINITIONS(${QT_DEFINITIONS}) +ADD_DEFINITIONS(-DQT_PLUGIN) +ADD_DEFINITIONS(-DQT_NO_DEBUG) +ADD_DEFINITIONS(-DQT_SHARED) + +link_directories(${CMAKE_CURRENT_BINARY_DIR}/..) + +# ball and stick dynamic engine +set(bsdyengine_SRCS bsdyengine.cpp) +KDE4_ADD_LIBRARY(bsdyengine-kalzium SHARED ${bsdyengine_SRCS} ${bsdyengine_UIS}) +TARGET_LINK_LIBRARIES(bsdyengine-kalzium avogadro-kalzium + ${OPENBABEL2_LIBRARIES} ${QT_LIBRARIES} + ${OPENGL_LIBRARIES} +) + +INSTALL(TARGETS bsdyengine-kalzium DESTINATION ${DESTINATION_DIR}) + +# label engine +set(labelengine_SRCS labelengine.cpp) +KDE4_ADD_LIBRARY(labelengine-kalzium SHARED ${labelengine_SRCS} ) +TARGET_LINK_LIBRARIES(labelengine-kalzium avogadro-kalzium + ${OPENBABEL2_LIBRARIES} ${QT_LIBRARIES} + ${OPENGL_LIBRARIES} +) +INSTALL(TARGETS labelengine-kalzium DESTINATION ${DESTINATION_DIR}) + +# wireframe +set(wireengine_SRCS wireengine.cpp) +KDE4_ADD_LIBRARY(wireengine-kalzium SHARED ${wireengine_SRCS} ) +TARGET_LINK_LIBRARIES(wireengine-kalzium avogadro-kalzium + ${OPENBABEL2_LIBRARIES} ${QT_LIBRARIES} + ${OPENGL_LIBRARIES} +) +INSTALL(TARGETS wireengine-kalzium DESTINATION ${DESTINATION_DIR}) + +# sphere +set(sphereengine_SRCS sphereengine.cpp) +KDE4_ADD_LIBRARY(sphereengine-kalzium SHARED ${sphereengine_SRCS} ) +TARGET_LINK_LIBRARIES(sphereengine-kalzium avogadro-kalzium + ${OPENBABEL2_LIBRARIES} ${QT_LIBRARIES} + ${OPENGL_LIBRARIES} +) + +INSTALL(TARGETS sphereengine-kalzium DESTINATION ${DESTINATION_DIR}) + +# stick (cylinder) engine +set(stickengine_SRCS stickengine.cpp) +KDE4_ADD_LIBRARY(stickengine-kalzium SHARED ${stickengine_SRCS} ) +TARGET_LINK_LIBRARIES(stickengine-kalzium avogadro-kalzium + ${OPENBABEL2_LIBRARIES} ${QT_LIBRARIES} + ${OPENGL_LIBRARIES} +) + +INSTALL(TARGETS stickengine-kalzium DESTINATION ${DESTINATION_DIR}) diff --git a/kalzium/libavogadro-kalzium/src/global.cpp b/kalzium/libavogadro-kalzium/src/global.cpp index 5c8ba37..c224484 100644 --- a/kalzium/libavogadro-kalzium/src/global.cpp +++ b/kalzium/libavogadro-kalzium/src/global.cpp @@ -47,12 +47,12 @@ namespace Avogadro QString Library::version() { - return VERSION; + return QString("0.6.1"); } QString Library::svnRevision() { - return SVN_REVISION; + return QString("Tag 0.6.1"); } QString Library::prefix() -- 2.11.4.GIT