From 077fbb5ea1f00bc60913005b61cbf7de9f7b04b7 Mon Sep 17 00:00:00 2001 From: Carsten Niehaus Date: Sat, 29 Mar 2008 18:59:16 +0100 Subject: [PATCH] Patch to CMake file to use KDE4 stuff --- kalzium/libavogadro-kalzium/src/CMakeLists.txt | 111 +++++++++---------------- 1 file changed, 41 insertions(+), 70 deletions(-) rewrite kalzium/libavogadro-kalzium/src/CMakeLists.txt (64%) diff --git a/kalzium/libavogadro-kalzium/src/CMakeLists.txt b/kalzium/libavogadro-kalzium/src/CMakeLists.txt dissimilarity index 64% index 9e3d2e0..2a59147 100644 --- a/kalzium/libavogadro-kalzium/src/CMakeLists.txt +++ b/kalzium/libavogadro-kalzium/src/CMakeLists.txt @@ -1,70 +1,41 @@ -set(QT_USE_QTOPENGL TRUE) - -configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in - ${CMAKE_CURRENT_BINARY_DIR}/config.h -) - -include(${QT_USE_FILE}) - -include_directories( - ${libavogadro-kalzium_SOURCE_DIR}/include - ${CMAKE_SOURCE_DIR} - ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_CURRENT_BINARY_DIR}/.. - ${OPENBABEL2_INCLUDE_DIR} - ${EIGEN_INCLUDE_DIR} -) - -set(libavogadro_SRCS - camera.cpp - color.cpp - engine.cpp - glwidget.cpp - moleculetreeview.cpp - primitive.cpp - tool.cpp - toolgroup.cpp - undosequence.cpp - painter.cpp - textrenderer.cpp - sphere.cpp - cylinder.cpp -) - -#Don't install headers since Kalzium is the only app using this snapshot -#set(libavogadro_HDRS -# color.h -# primitive.h -# engine.h -# glwidget.h -# toolgroup.h -# moleculetreeview.h -# global.h -# camera.h -# undosequence.h -# painter.h -#) - - -#set(libavogadro_MOC_HDRS - #primitive.h - #glwidget.h - #moleculetreeview.h -#) -#qt4_wrap_cpp(libavogadro_MOC_SRCS ${libavogadro_MOC_HDRS}) - -# Install the library to avogadro-kalzium so that it does not collide with avo -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.0.1 SOVERSION 0 ) - -TARGET_LINK_LIBRARIES(avogadro-kalzium ${OPENBABEL2_LIBRARIES} ${QT_LIBRARIES} - ${OPENGL_LIBRARIES} ${KDE4_KDECORE_LIBS} ) -install(TARGETS avogadro-kalzium ${INSTALL_TARGETS_DEFAULT_ARGS}) - -#Don't install headers since Kalzium is the only app using this snapshot -#INSTALL(FILES ${libavogadro_HDRS} DESTINATION include/avogadro) - -add_subdirectory(engines) -add_subdirectory(tools) +set(QT_USE_QTOPENGL true) + +configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in + ${CMAKE_CURRENT_BINARY_DIR}/config.h +) + +include(${QT_USE_FILE}) + +include_directories( + ${libavogadro-kalzium_SOURCE_DIR}/include + ${CMAKE_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR}/.. + ${OPENBABEL2_INCLUDE_DIR} + ${EIGEN_INCLUDE_DIR} +) + +FILE(GLOB libavogadro_SRCS "*.cpp") +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 ) + +TARGET_LINK_LIBRARIES(avogadro-kalzium ${OPENBABEL2_LIBRARIES} ${QT_LIBRARIES} + ${OPENGL_LIBRARIES} + ) + + +add_subdirectory(engines) +add_subdirectory(tools) -- 2.11.4.GIT