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

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

Revision: 90
          http://ktutorial.svn.sourceforge.net/ktutorial/?rev=90&view=rev
Author:   danxuliu
Date:     2010-02-13 19:41:09 +0000 (Sat, 13 Feb 2010)

Log Message:
-----------
Fix testing with the new layout (generate CTestTestfile.cmake in the root project build directory, fix included directories in tests).

Modified Paths:
--------------
    trunk/ktutorial/CMakeLists.txt
    trunk/ktutorial/ktutorial-library/test/CMakeLists.txt
    trunk/ktutorial/ktutorial-library/test/scripting/CMakeLists.txt
    trunk/ktutorial/ktutorial-library/test/view/CMakeLists.txt

Modified: trunk/ktutorial/CMakeLists.txt
===================================================================
--- trunk/ktutorial/CMakeLists.txt	2010-02-13 19:19:22 UTC (rev 89)
+++ trunk/ktutorial/CMakeLists.txt	2010-02-13 19:41:09 UTC (rev 90)
@@ -2,5 +2,7 @@
 
 find_package(KDE4 REQUIRED)
 
+enable_testing()
+
 macro_optional_add_subdirectory(ktutorial-library)
 macro_optional_add_subdirectory(ktutorial-test-app)

Modified: trunk/ktutorial/ktutorial-library/test/CMakeLists.txt
===================================================================
--- trunk/ktutorial/ktutorial-library/test/CMakeLists.txt	2010-02-13 19:19:22 UTC (rev 89)
+++ trunk/ktutorial/ktutorial-library/test/CMakeLists.txt	2010-02-13 19:41:09 UTC (rev 90)
@@ -4,7 +4,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_SOURCE_DIR}/src ${KDE4_INCLUDES})
+include_directories(${CMAKE_CURRENT_BINARY_DIR} ${ktutorial-library_SOURCE_DIR}/src ${KDE4_INCLUDES})
 
 MACRO(UNIT_TESTS)
     FOREACH(_className ${ARGN})

Modified: trunk/ktutorial/ktutorial-library/test/scripting/CMakeLists.txt
===================================================================
--- trunk/ktutorial/ktutorial-library/test/scripting/CMakeLists.txt	2010-02-13 19:19:22 UTC (rev 89)
+++ trunk/ktutorial/ktutorial-library/test/scripting/CMakeLists.txt	2010-02-13 19:41:09 UTC (rev 90)
@@ -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_SOURCE_DIR}/src/scripting ${KDE4_INCLUDES})
+include_directories(${CMAKE_CURRENT_BINARY_DIR} ${ktutorial-library_SOURCE_DIR}/src/scripting ${KDE4_INCLUDES})
 
 MACRO(UNIT_TESTS)
     FOREACH(_className ${ARGN})

Modified: trunk/ktutorial/ktutorial-library/test/view/CMakeLists.txt
===================================================================
--- trunk/ktutorial/ktutorial-library/test/view/CMakeLists.txt	2010-02-13 19:19:22 UTC (rev 89)
+++ trunk/ktutorial/ktutorial-library/test/view/CMakeLists.txt	2010-02-13 19:41:09 UTC (rev 90)
@@ -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_SOURCE_DIR}/src/view ${ktutorial_BINARY_DIR}/src/view ${KDE4_INCLUDES})
+include_directories(${CMAKE_CURRENT_BINARY_DIR} ${ktutorial-library_SOURCE_DIR}/src/view ${ktutorial-library_BINARY_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.