From: Carsten Niehaus <cniehaus@gmx.de>
Date: Mon, 27 Nov 2006 15:01:40 +0000 (+0000)
Subject: Arrg. Now it should really compile.
X-Git-Tag: v3.80.3~101
X-Git-Url: https://git.rmz.fi/?a=commitdiff_plain;h=refs%2Fremotes%2Fupstream%2Fkde-kaction-cleanup1;p=libqmvoc.git

Arrg. Now it should really compile.

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

diff --git a/libscience/CMakeLists.txt b/libscience/CMakeLists.txt
index eedd9f0..7493561 100644
--- a/libscience/CMakeLists.txt
+++ b/libscience/CMakeLists.txt
@@ -1,5 +1,8 @@
 add_subdirectory(data)
+
+if(OPENBABEL2_FOUND AND OPENGL_FOUND AND EIGEN_FOUND)
 add_subdirectory(compoundviewer)
+endif(OPENBABEL2_FOUND AND OPENGL_FOUND AND EIGEN_FOUND)
 
 #comment these lines out if you don't want to build the test
 set(parsertest_SRCS xmlreadingtest.cpp)
diff --git a/libscience/compoundviewer/CMakeLists.txt b/libscience/compoundviewer/CMakeLists.txt
index 34d92a4..9cb157a 100644
--- a/libscience/compoundviewer/CMakeLists.txt
+++ b/libscience/compoundviewer/CMakeLists.txt
@@ -1,24 +1,22 @@
 include_directories(
-   ${CMAKE_SOURCE_DIR}/..
-   ${CMAKE_CURRENT_BINARY_DIR}/..
-)
+  ${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} )
+set( compoundviewer_SRCS
+  kalziumglhelperclasses.cpp
+  kalziumglwidget.cpp
+  openbabel2wrapper.cpp
+  kalziumglpart.cpp
+  )
+include_directories( ${OPENBABEL2_INCLUDE_DIR} )
 
-  kde4_automoc(${compoundviewer_SRCS})
-  add_subdirectory(widgets)
+kde4_automoc(${compoundviewer_SRCS})
+add_subdirectory(widgets)
 
-  kde4_add_library(compoundviewer SHARED ${compoundviewer_SRCS})
+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} )
-endif(OPENBABEL2_FOUND AND OPENGL_FOUND AND EIGEN_FOUND)
+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 )
 
diff --git a/libscience/compoundviewer/widgets/CMakeLists.txt b/libscience/compoundviewer/widgets/CMakeLists.txt
index c7b6490..79756f6 100644
--- a/libscience/compoundviewer/widgets/CMakeLists.txt
+++ b/libscience/compoundviewer/widgets/CMakeLists.txt
@@ -3,9 +3,8 @@ include_directories(
    ${CMAKE_CURRENT_BINARY_DIR}/..
    ${CMAKE_CURRENT_SOURCE_DIR}/..
 )
-if(OPENBABEL2_FOUND)
-	include_directories( ${OPENBABEL2_INCLUDE_DIR} ..)
-endif(OPENBABEL2_FOUND)
+
+include_directories( ${OPENBABEL2_INCLUDE_DIR} ..)
 
 set(kalziumui_PART_SRCS 
    ${CMAKE_CURRENT_SOURCE_DIR}/../kalziumglwidget.cpp