Git commit c201037cfdaa0c6ddc42f3fc95eba47dcc088b71 by Andreas Cord-Landweh= r. Committed on 30/09/2012 at 21:23. Pushed by cordlandwehr into branch 'master'. Fix linking against RocsCore. M +1 -3 CMakeLists.txt M +1 -1 RocsCore/CMakeLists.txt M +1 -1 RocsCore/DataStructures/Graph/Tests/CMakeLists.txt M +1 -1 RocsCore/DataStructures/LinkedList/Tests/CMakeLists.txt M +1 -1 RocsCore/LoadSave/Plugins/dotFileFormat/CMakeLists.txt M +1 -1 RocsCore/LoadSave/Plugins/dotFileFormat/Tests/CMakeLists.txt M +1 -1 RocsCore/LoadSave/Plugins/gmlFileFormat/CMakeLists.txt M +1 -1 RocsCore/LoadSave/Plugins/gmlFileFormat/Tests/CMakeLists.txt M +1 -1 RocsCore/LoadSave/Plugins/kmlFileFormat/CMakeLists.txt M +1 -1 RocsCore/LoadSave/Plugins/kmlFileFormat/Tests/CMakeLists.txt http://commits.kde.org/rocs/c201037cfdaa0c6ddc42f3fc95eba47dcc088b71 diff --git a/CMakeLists.txt b/CMakeLists.txt index 9c2d0fc..98b09ac 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -54,14 +54,12 @@ include_directories( ${Boost_INCLUDE_DIRS} ) = - - # Allow disabling building of optional graph file backands option(ROCS_BUILD_LOADSAVE "ROCS_BUILD_LOADSAVE" ON) macro_log_feature( ROCS_BUILD_LOADSAVE "Graph File Plugins" - "Building of extra graph file plugins is disabled." + "Building of extra graph file plugins" "edu.kde.org/rocs" FALSE ) diff --git a/RocsCore/CMakeLists.txt b/RocsCore/CMakeLists.txt index f4f875a..3280d5f 100644 --- a/RocsCore/CMakeLists.txt +++ b/RocsCore/CMakeLists.txt @@ -53,7 +53,7 @@ target_link_libraries( rocscore ${QT_QTSCRIPTTOOLS_LIBRARY} ) = -set( rocslib_LIB_HDRS +set( rocscore_LIB_HDRS DynamicPropertiesList.h Data.h DataStructure.h diff --git a/RocsCore/DataStructures/Graph/Tests/CMakeLists.txt b/RocsCore/= DataStructures/Graph/Tests/CMakeLists.txt index 2de3ead..a54d9b0 100644 --- a/RocsCore/DataStructures/Graph/Tests/CMakeLists.txt +++ b/RocsCore/DataStructures/Graph/Tests/CMakeLists.txt @@ -26,7 +26,7 @@ set (TestGraphStructure_SRCS ) kde4_add_executable(TestGraphStructure ${TestGraphStructure_SRCS} ) target_link_libraries( TestGraphStructure - rocslib + rocscore rocs_GraphStructure ${KDE4_KROSSUI_LIBS} ${QT_QTGUI_LIBRARY} diff --git a/RocsCore/DataStructures/LinkedList/Tests/CMakeLists.txt b/Rocs= Core/DataStructures/LinkedList/Tests/CMakeLists.txt index 8be71d1..29a7833 100644 --- a/RocsCore/DataStructures/LinkedList/Tests/CMakeLists.txt +++ b/RocsCore/DataStructures/LinkedList/Tests/CMakeLists.txt @@ -26,7 +26,7 @@ set (TestLinkedListStructure_SRCS ) kde4_add_executable(TestLinkedListStructure ${TestLinkedListStructure_SRCS= } ) target_link_libraries( TestLinkedListStructure - rocslib + rocscore rocs_ListStructure ${KDE4_KROSSUI_LIBS} ${QT_QTGUI_LIBRARY} diff --git a/RocsCore/LoadSave/Plugins/dotFileFormat/CMakeLists.txt b/RocsC= ore/LoadSave/Plugins/dotFileFormat/CMakeLists.txt index d641635..1677219 100644 --- a/RocsCore/LoadSave/Plugins/dotFileFormat/CMakeLists.txt +++ b/RocsCore/LoadSave/Plugins/dotFileFormat/CMakeLists.txt @@ -33,7 +33,7 @@ set(dotFileFormatPlugin_SRCS kde4_add_plugin(rocs_dotfileformat ${dotFileFormatPlugin_SRCS}) = target_link_libraries(rocs_dotfileformat - rocslib + rocscore rocs_GraphStructure ${KDE4_KDEUI_LIBS} ) diff --git a/RocsCore/LoadSave/Plugins/dotFileFormat/Tests/CMakeLists.txt b= /RocsCore/LoadSave/Plugins/dotFileFormat/Tests/CMakeLists.txt index 263bbce..7db5e8e 100644 --- a/RocsCore/LoadSave/Plugins/dotFileFormat/Tests/CMakeLists.txt +++ b/RocsCore/LoadSave/Plugins/dotFileFormat/Tests/CMakeLists.txt @@ -29,7 +29,7 @@ set(TestDotFileFormatPlugin_SRCS ) kde4_add_unit_test(TestDotFileFormatPlugin ${TestDotFileFormatPlugin_SRCS}) target_link_libraries(TestDotFileFormatPlugin - rocslib + rocscore rocs_GraphStructure ${QT_QTTEST_LIBRARY} ${KDE4_KDECORE_LIBS} diff --git a/RocsCore/LoadSave/Plugins/gmlFileFormat/CMakeLists.txt b/RocsC= ore/LoadSave/Plugins/gmlFileFormat/CMakeLists.txt index 584fda1..651f89b 100644 --- a/RocsCore/LoadSave/Plugins/gmlFileFormat/CMakeLists.txt +++ b/RocsCore/LoadSave/Plugins/gmlFileFormat/CMakeLists.txt @@ -33,7 +33,7 @@ set(gmlFileFormatPlugin_SRCS kde4_add_plugin(rocs_gmlfileformat ${gmlFileFormatPlugin_SRCS}) = target_link_libraries(rocs_gmlfileformat - rocslib + rocscore rocs_GraphStructure ${KDE4_KDEUI_LIBS} ) diff --git a/RocsCore/LoadSave/Plugins/gmlFileFormat/Tests/CMakeLists.txt b= /RocsCore/LoadSave/Plugins/gmlFileFormat/Tests/CMakeLists.txt index 7b98d6f..f6501d4 100644 --- a/RocsCore/LoadSave/Plugins/gmlFileFormat/Tests/CMakeLists.txt +++ b/RocsCore/LoadSave/Plugins/gmlFileFormat/Tests/CMakeLists.txt @@ -28,7 +28,7 @@ set(TestGmlFileFormatPlugin_SRCS ) kde4_add_unit_test(TestGmlFileFormatPlugin ${TestGmlFileFormatPlugin_SRCS}) target_link_libraries(TestGmlFileFormatPlugin - rocslib + rocscore rocs_GraphStructure ${QT_QTTEST_LIBRARY} ${KDE4_KDECORE_LIBS} diff --git a/RocsCore/LoadSave/Plugins/kmlFileFormat/CMakeLists.txt b/RocsC= ore/LoadSave/Plugins/kmlFileFormat/CMakeLists.txt index 013de98..c622b06 100644 --- a/RocsCore/LoadSave/Plugins/kmlFileFormat/CMakeLists.txt +++ b/RocsCore/LoadSave/Plugins/kmlFileFormat/CMakeLists.txt @@ -32,7 +32,7 @@ set(kmlFileFormatPlugin_SRCS kde4_add_plugin(rocs_kmlfileformat ${kmlFileFormatPlugin_SRCS}) = target_link_libraries(rocs_kmlfileformat - rocslib + rocscore rocs_GraphStructure ${QT_QTXML_LIBRARY} ${KDE4_KDEUI_LIBS} diff --git a/RocsCore/LoadSave/Plugins/kmlFileFormat/Tests/CMakeLists.txt b= /RocsCore/LoadSave/Plugins/kmlFileFormat/Tests/CMakeLists.txt index d3b5889..4eec16d 100644 --- a/RocsCore/LoadSave/Plugins/kmlFileFormat/Tests/CMakeLists.txt +++ b/RocsCore/LoadSave/Plugins/kmlFileFormat/Tests/CMakeLists.txt @@ -25,7 +25,7 @@ set(TestKmlFileFormatPlugin_SRCS ) kde4_add_unit_test(TestKmlFileFormatPlugin ${TestKmlFileFormatPlugin_SRCS}) target_link_libraries(TestKmlFileFormatPlugin - rocslib + rocscore rocs_GraphStructure ${QT_QTXML_LIBRARY} ${QT_QTTEST_LIBRARY}