[Ktutorial-commits] SF.net SVN: ktutorial:[203] trunk/ktutorial/ktutorial-editor

[<dan...@us...>]

Revision: 203
          http://ktutorial.svn.sourceforge.net/ktutorial/?rev=203&view=rev
Author:   danxuliu
Date:     2010-03-28 00:53:41 +0000 (Sun, 28 Mar 2010)

Log Message:
-----------
CMakeLists.txt cleanups

Modified Paths:
--------------
    trunk/ktutorial/ktutorial-editor/src/CMakeLists.txt
    trunk/ktutorial/ktutorial-editor/src/serialization/CMakeLists.txt
    trunk/ktutorial/ktutorial-editor/src/view/CMakeLists.txt
    trunk/ktutorial/ktutorial-editor/tests/unit/CMakeLists.txt
    trunk/ktutorial/ktutorial-editor/tests/unit/serialization/CMakeLists.txt
    trunk/ktutorial/ktutorial-editor/tests/unit/view/CMakeLists.txt

Modified: trunk/ktutorial/ktutorial-editor/src/CMakeLists.txt
===================================================================
--- trunk/ktutorial/ktutorial-editor/src/CMakeLists.txt	2010-03-28 00:50:53 UTC (rev 202)
+++ trunk/ktutorial/ktutorial-editor/src/CMakeLists.txt	2010-03-28 00:53:41 UTC (rev 203)
@@ -2,12 +2,12 @@
 # In order to work, they must be compiled using -fPIC
 add_definitions("-fPIC")
 
+include_directories(${KDE4_INCLUDES})
+
 add_subdirectory(data)
 add_subdirectory(serialization)
 add_subdirectory(view)
 
-include_directories(${KDE4_INCLUDES})
-
 set(ktutorial_editor_SRCS
     Exception.cpp
     KTutorialEditor.cpp
@@ -23,7 +23,6 @@
                       ktutorial_editor_data
                       ktutorial_editor_serialization
                       ktutorial_editor_view
-                      ${KDE4_KIO_LIBS}
 )
 
 kde4_add_executable(ktutorial-editor main.cpp)

Modified: trunk/ktutorial/ktutorial-editor/src/serialization/CMakeLists.txt
===================================================================
--- trunk/ktutorial/ktutorial-editor/src/serialization/CMakeLists.txt	2010-03-28 00:50:53 UTC (rev 202)
+++ trunk/ktutorial/ktutorial-editor/src/serialization/CMakeLists.txt	2010-03-28 00:53:41 UTC (rev 203)
@@ -1,5 +1,3 @@
-include_directories(${KDE4_INCLUDES})
-
 set(ktutorial_editor_serialization_SRCS
     DeserializationException.cpp
     IOException.cpp
@@ -11,4 +9,4 @@
 
 kde4_add_library(ktutorial_editor_serialization ${ktutorial_editor_serialization_SRCS})
 
-target_link_libraries(ktutorial_editor_serialization ktutorial_editor ${KDE4_LIBS})
+target_link_libraries(ktutorial_editor_serialization ktutorial_editor ${KDE4_KIO_LIBS})

Modified: trunk/ktutorial/ktutorial-editor/src/view/CMakeLists.txt
===================================================================
--- trunk/ktutorial/ktutorial-editor/src/view/CMakeLists.txt	2010-03-28 00:50:53 UTC (rev 202)
+++ trunk/ktutorial/ktutorial-editor/src/view/CMakeLists.txt	2010-03-28 00:53:41 UTC (rev 203)
@@ -1,5 +1,3 @@
-include_directories(${KDE4_INCLUDES})
-
 set(ktutorial_editor_view_SRCS
     ActionListWidget.cpp
     EditionDialog.cpp

Modified: trunk/ktutorial/ktutorial-editor/tests/unit/CMakeLists.txt
===================================================================
--- trunk/ktutorial/ktutorial-editor/tests/unit/CMakeLists.txt	2010-03-28 00:50:53 UTC (rev 202)
+++ trunk/ktutorial/ktutorial-editor/tests/unit/CMakeLists.txt	2010-03-28 00:53:41 UTC (rev 203)
@@ -5,7 +5,6 @@
 # Used by kde4_add_unit_test to set the full path to test executables
 set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
 
-# include_directories(${CMAKE_CURRENT_BINARY_DIR} ${ktutorial-editor_SOURCE_DIR}/src/view ${ktutorial-editor_BINARY_DIR}/src/view ${KDE4_INCLUDES})
 include_directories(${ktutorial-editor_SOURCE_DIR}/src/ ${KDE4_INCLUDES})
 
 MACRO(UNIT_TESTS)

Modified: trunk/ktutorial/ktutorial-editor/tests/unit/serialization/CMakeLists.txt
===================================================================
--- trunk/ktutorial/ktutorial-editor/tests/unit/serialization/CMakeLists.txt	2010-03-28 00:50:53 UTC (rev 202)
+++ trunk/ktutorial/ktutorial-editor/tests/unit/serialization/CMakeLists.txt	2010-03-28 00:53:41 UTC (rev 203)
@@ -1,7 +1,7 @@
 # Used by kde4_add_unit_test to set the full path to test executables
 set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
 
-include_directories(${CMAKE_CURRENT_BINARY_DIR} ${ktutorial-editor_SOURCE_DIR}/src/serialization ${ktutorial-editor_BINARY_DIR}/src/serialization ${KDE4_INCLUDES})
+include_directories(${ktutorial-editor_SOURCE_DIR}/src/serialization ${KDE4_INCLUDES})
 
 MACRO(UNIT_TESTS)
     FOREACH(_className ${ARGN})

Modified: trunk/ktutorial/ktutorial-editor/tests/unit/view/CMakeLists.txt
===================================================================
--- trunk/ktutorial/ktutorial-editor/tests/unit/view/CMakeLists.txt	2010-03-28 00:50:53 UTC (rev 202)
+++ trunk/ktutorial/ktutorial-editor/tests/unit/view/CMakeLists.txt	2010-03-28 00:53:41 UTC (rev 203)
@@ -1,7 +1,7 @@
 # Used by kde4_add_unit_test to set the full path to test executables
 set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
 
-include_directories(${CMAKE_CURRENT_BINARY_DIR} ${ktutorial-editor_SOURCE_DIR}/src/view ${ktutorial-editor_BINARY_DIR}/src/view ${KDE4_INCLUDES})
+include_directories(${ktutorial-editor_SOURCE_DIR}/src/view ${KDE4_INCLUDES})
 
 # Since Qt 4.6.0, this definition is needed for GUI testing.
 # It is backwards compatible with previous Qt versions, unlike the alternative


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.