CMake: cleanup of CMakeListst.txt files

git-svn-id: https://svn.sfb588.uni-karlsruhe.de/svn/ArmarXGui/trunk@17 cc370d20-7989-40c7-8cf1-6d89a6142718

CMakeLists.txt

@@ -12,8 +12,8 @@ endif()
 
 find_package("ArmarXCore" REQUIRED
     PATHS "$ENV{HOME}/armarx/Core/build/cmake"
-        "$ENV{HOME}/armarx-install/share/cmake/ArmarXCore"
-        "/org/share/archive/SFB588_RefDist/armarx/share/cmake/ArmarXCore"
+          "$ENV{HOME}/armarx-install/share/cmake/ArmarXCore"
+          "/org/share/archive/SFB588_RefDist/armarx/share/cmake/ArmarXCore"
 )
 
 include(${ArmarXCore_CMAKE_DIR}/ArmarXProject.cmake)

Widget/CMakeLists.txt

@@ -9,74 +9,50 @@
 find_package(Qt4 COMPONENTS QtPlugin QtCore QtGui QtScript QtXml QtDesigner QtShared REQUIRED)
 #find_package(Qt4 REQUIRED)
 
-# Add more libraries you depend on here, e.g. ${QT_LIBRARIES}.
-set(COMPONENT_LIBS ArmarXInterfaces ArmarXCore ${QT_LIBRARIES})
-
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${QT_INCLUDE_DIR}
-    ${QT_QTDESIGNER_INCLUDE_DIR}
-    ${ARMARX_BASE_DIR}
-    ${ARMARX_BASE_DIR}/armarx/interface/cpp
-)
-
-include(${QT_USE_FILE})
-
-#add_definitions(${QT_DEFINITIONS})
-add_definitions(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
-add_definitions(-DQT_NO_DEBUG)
-add_definitions(-DQDESIGNER_EXPORT_WIDGETS)
-
-
-#if (QT_FOUND)
-#endif()
-
-
-#file(GLOB SOURCES *.cpp)
-set(SOURCES
-    WidgetPlugin.cpp
-    Widget.cpp
-)
-
-#file(GLOB HEADERS *.h)
-
-set(QT_MOC_HDRS
-    WidgetPlugin.h
-    Widget.h
-)
-
-set(QT_UIS
-   Widget.ui
-)
-
-# just for infos
-qt4_get_moc_flags(moc_flags)
-
-qt4_wrap_cpp(SOURCES ${QT_MOC_HDRS} )#OPTIONS "-DQT_PLUGIN -DQT_SCRIPT_LIB -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQDESIGNER_EXPORT_WIDGETS -DQT_SHARED")
-
-qt4_wrap_ui(UI_HEADER ${QT_UIS})
-#    get_filename_component(UI_HEADER_DIR ${UI_HEADER} PATH)
-
-#    list(APPEND HEADERS ${UI_HEADER})
-
-#    include_directories(${UI_HEADER_DIR})
-
-set(ALL_SRCS ${SOURCES} ${HEADERS} ${UI_HEADER})
-
-#message(STATUS "moc_flags: " ${moc_flags})
-#message(STATUS "QT_DEFINITIONS: " ${QT_DEFINITIONS})
-#message(STATUS "QT_USE_FILE: " ${QT_USE_FILE})
-#message(STATUS "QT_LIBRARIES: " ${QT_LIBRARIES})
-#message(STATUS "UNIX: " ${UNIX})
-#message(STATUS "SOURCES: " ${SOURCES})
-#message(STATUS "HEADERS: " ${HEADERS})
-#message(STATUS "ALL_SRCS: " ${ALL_SRCS})
-
-use_ice()
-
-
-add_library(WidgetPlugin SHARED ${ALL_SRCS})
-
-target_link_libraries(WidgetPlugin ${COMPONENT_LIBS})
+if (QT_FOUND)
+    include(${QT_USE_FILE})
+
+    include_directories(
+        ${QT_INCLUDE_DIR}
+        ${QT_QTDESIGNER_INCLUDE_DIR}
+    )
+    
+    #add_definitions(${QT_DEFINITIONS})
+    add_definitions(-DQT_PLUGIN)
+    add_definitions(-DQT_SHARED)
+    add_definitions(-DQT_NO_DEBUG)
+    add_definitions(-DQDESIGNER_EXPORT_WIDGETS)
+    
+    set(SOURCES
+        WidgetPlugin.cpp
+        Widget.cpp
+    )
+    
+    set(QT_MOC_HDRS
+        WidgetPlugin.h
+        Widget.h
+    )
+    
+    set(QT_UIS
+       Widget.ui
+    )
+    
+    # just for infos
+    qt4_get_moc_flags(moc_flags)
+    
+    qt4_wrap_cpp(SOURCES ${QT_MOC_HDRS} )#OPTIONS "-DQT_PLUGIN -DQT_SCRIPT_LIB -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQDESIGNER_EXPORT_WIDGETS -DQT_SHARED")
+    
+    qt4_wrap_ui(UI_HEADER ${QT_UIS})
+
+    set(ALL_SRCS ${SOURCES} ${HEADERS} ${UI_HEADER})
+    
+    use_ice()
+    
+    # Add more libraries you depend on here, e.g. ${QT_LIBRARIES}.
+    set(COMPONENT_LIBS ArmarXInterfaces ArmarXCore ${QT_LIBRARIES})
+    
+    add_library(WidgetPlugin SHARED ${ALL_SRCS})
+    
+    target_link_libraries(WidgetPlugin ${COMPONENT_LIBS})
+
+endif()

plugins/KinematicUnitPlugin/CMakeLists.txt

@@ -34,8 +34,8 @@ if (ARMARX_BUILD)
     link_directories(${ArmarXGui_LIBRARY_DIRS})
 
     include(${ArmarXCore_CMAKE_DIR}/ArmarXGui.cmake)
-    file(GLOB SOURCES *.cpp)
-    file(GLOB HEADERS *.h)
+    file(GLOB SOURCES KinematicUnitGuiPlugin.cpp)
+    file(GLOB HEADERS KinematicUnitGuiPlugin.h)
 
     set(GUI_MOC_HDRS
         KinematicUnitGuiPlugin.h
@@ -46,8 +46,7 @@ if (ARMARX_BUILD)
     )
 
 
-    #set(COMPONENT_LIBS Armar3 Armar3Interfaces ${SoQt_LIBRARIES} ${VirtualRobot_LIBRARIES} ${Coin3D_LIBRARIES})
-    set(COMPONENT_LIBS ${SoQt_LIBRARIES} ${VirtualRobot_LIBRARIES} ${Coin3D_LIBRARIES})
+    set(COMPONENT_LIBS ArmarXInterfaces ArmarXCore ArmarXCoreUnits  ${SoQt_LIBRARIES} ${VirtualRobot_LIBRARIES} ${Coin3D_LIBRARIES})
 
     message(STATUS "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!data path: "  ${ARMARX_BASE_DIR})
     add_definitions(-DARMARX_DATA_PATH="${ARMARX_BASE_DIR}/data")