logo       

playground/edu/Rocs: msg#12892

kde-commits

Subject: playground/edu/Rocs

SVN commit 1005185 by tcanabrava:

fixes compilation.

M +0 -3 CMakeLists.txt
M +1 -0 src/Actions/CMakeLists.txt
M +12 -12 src/CMakeLists.txt
M +1 -1 src/GraphicsItem/CMakeLists.txt
M +1 -1 src/Main.cpp


--- trunk/playground/edu/Rocs/CMakeLists.txt #1005184:1005185
@@ -13,10 +13,7 @@
find_package(KDE4 REQUIRED)
find_package(GraphViz REQUIRED)

-
include(KDE4Defaults)
-#include(MacroLibrary)
-#include(CheckIncludeFile)

add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})

--- trunk/playground/edu/Rocs/src/Actions/CMakeLists.txt #1005184:1005185
@@ -4,6 +4,7 @@
../Engine
../Models
../GraphicsItem
+ ../Interface
)

set(librocsactions_SRCS
--- trunk/playground/edu/Rocs/src/CMakeLists.txt #1005184:1005185
@@ -1,7 +1,5 @@
include_directories( ${KDE4_INCLUDES} ${QT_INCLUDES} )

-find_package(GraphViz REQUIRED)
-
add_subdirectory(Core)
add_subdirectory(Actions)
add_subdirectory(Models)
@@ -21,16 +19,18 @@
kde4_add_executable(rocs ${rocs_SRCS} ${rocs_RCC_SRCS})

target_link_libraries(rocs ${KDE4_KDEUI_LIBS}
- ${KDE4_KROSSUI_LIBS}
- ${KDE4_KIO_LIBS}
- ${KDE4_KTEXTEDITOR_LIBS}
- ${QT_QTSCRIPT_LIBRARY}
-
- librocsui
- librocsgraphics
- librocsmodel
- librocsactions
- librocscore
+ ${KDE4_KROSSUI_LIBS}
+ ${KDE4_KIO_LIBS}
+ ${KDE4_KTEXTEDITOR_LIBS}
+ ${QT_QTSCRIPT_LIBRARY}
+ gvc
+ graph
+ cdt
+ librocsui
+ librocsgraphics
+ librocsmodel
+ librocsactions
+ librocscore
)

install( TARGETS rocs ${INSTALL_TARGETS_DEFAULT_ARGS} )
--- trunk/playground/edu/Rocs/src/GraphicsItem/CMakeLists.txt #1005184:1005185
@@ -1,5 +1,5 @@

-include_directories( ${KDE4_INCLUDES} ${QT_INCLUDES} ../Core ../Actions)
+include_directories( ${KDE4_INCLUDES} ${QT_INCLUDES} ../Core ../Actions
../Interface)

set( rocsgraphics_LIB_SRCS
NodeItem.cpp
--- trunk/playground/edu/Rocs/src/Main.cpp #1005184:1005185
@@ -22,7 +22,7 @@
#include <KApplication>
#include <KAboutData>
#include <KCmdLineArgs>
-#include "SUI_MainWindow.h"
+#include "Interface/SUI_MainWindow.h"

int main ( int argc, char *argv[] ) {
KAboutData aboutData ("rocs",

<Prev in Thread] Current Thread [Next in Thread>
Google Custom Search

News | Mail Home | sitemap | FAQ | advertise