From 1e875b54fdf4f937a0ddd02d17a97d5c7367c279 Mon Sep 17 00:00:00 2001
From: Carsten Niehaus <cniehaus@kde.org>
Date: Sun, 30 Mar 2008 13:35:22 +0200
Subject: [PATCH] some fixes to the cmake files. It still is not working

---
 kalzium/CMakeLists.txt                             |   6 +-
 kalzium/libavogadro-kalzium/src/CMakeLists.txt     |   2 +-
 .../libavogadro-kalzium/src/engines/CMakeLists.txt | 134 +++++++++++----------
 3 files changed, 73 insertions(+), 69 deletions(-)
 rewrite kalzium/libavogadro-kalzium/src/engines/CMakeLists.txt (65%)

diff --git a/kalzium/CMakeLists.txt b/kalzium/CMakeLists.txt
index acc7477..3fed1d8 100644
--- a/kalzium/CMakeLists.txt
+++ b/kalzium/CMakeLists.txt
@@ -8,11 +8,11 @@ macro_log_feature(PLASMA_FOUND "Plasma" "Plasma is the KDE4 desktop" "http://pla
 
 if(OPENBABEL2_FOUND AND OPENGL_FOUND AND EIGEN_FOUND)
 	add_subdirectory(libavogadro-kalzium)
-	add_subdirectory(compoundviewer)
+   #	add_subdirectory(compoundviewer)
 endif(OPENBABEL2_FOUND AND OPENGL_FOUND AND EIGEN_FOUND)
 
-add_subdirectory(src)
-add_subdirectory(data)
+#add_subdirectory(src)
+##add_subdirectory(data)
 #if(HAVE_PLASMA)
    #   add_subdirectory(plasmoid)
 #endif(HAVE_PLASMA)
diff --git a/kalzium/libavogadro-kalzium/src/CMakeLists.txt b/kalzium/libavogadro-kalzium/src/CMakeLists.txt
index a51485d..c7bc21c 100644
--- a/kalzium/libavogadro-kalzium/src/CMakeLists.txt
+++ b/kalzium/libavogadro-kalzium/src/CMakeLists.txt
@@ -31,4 +31,4 @@ TARGET_LINK_LIBRARIES(avogadro-kalzium ${OPENBABEL2_LIBRARIES} ${QT_LIBRARIES}
 
 
 add_subdirectory(engines)
-add_subdirectory(tools)
+#add_subdirectory(tools)
diff --git a/kalzium/libavogadro-kalzium/src/engines/CMakeLists.txt b/kalzium/libavogadro-kalzium/src/engines/CMakeLists.txt
dissimilarity index 65%
index 45ec096..839d018 100644
--- a/kalzium/libavogadro-kalzium/src/engines/CMakeLists.txt
+++ b/kalzium/libavogadro-kalzium/src/engines/CMakeLists.txt
@@ -1,65 +1,69 @@
-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})
+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}/../../../../lib)
+
+message( "linken: " )
+message(${CMAKE_CURRENT_BINARY_DIR}/../../../../lib)
+
+# ball and stick dynamic engine
+set(bsdyengine_SRCS bsdyengine.cpp)
+qt4_wrap_ui(bsdyengine_UIS bsdysettingswidget.ui)
+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})
-- 
2.11.4.GIT