move the test application to tests sub-directory

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e9fa894..180cbe5 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,7 +45,6 @@ install(
 )
 
 add_subdirectory(src)
-add_subdirectory(tools)
 
 if (ENABLE_TESTING)
     enable_testing()

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index a610fdf..7a9e90d 100644 (file)
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,3 +1,5 @@
+add_subdirectory(testapp)
+
 set(test_LIBRARIES
     ${QT_QTGUI_LIBRARY}
     ${QT_QTCORE_LIBRARY}
@@ -7,8 +9,8 @@ set(test_LIBRARIES
 )
 
 include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}/../src
-    ${CMAKE_CURRENT_BINARY_DIR}/../src
+    ${CMAKE_SOURCE_DIR}/src
+    ${CMAKE_BINARY_DIR}/src
     ${CMAKE_CURRENT_BINARY_DIR}
     ${QT_QTTEST_INCLUDE_DIR}
     ${QT_QTDBUS_INCLUDE_DIR}

diff --git a/tools/testapp/CMakeLists.txt b/tests/testapp/CMakeLists.txt
similarity index 80%
rename from tools/testapp/CMakeLists.txt
rename to tests/testapp/CMakeLists.txt
index e82cd53..e1325be 100644 (file)
--- a/tools/testapp/CMakeLists.txt
+++ b/tests/testapp/CMakeLists.txt
@@ -5,8 +5,8 @@ set(qtapp_SRCS
 add_executable(dbusmenubench-qtapp ${qtapp_SRCS})
 
 include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}/../../src
-    ${CMAKE_CURRENT_BINARY_DIR}/../../src
+    ${CMAKE_SOURCE_DIR}/src
+    ${CMAKE_BINARY_DIR}/src
     ${QT_INCLUDE_DIR}
     ${QT_QTCORE_INCLUDE_DIR}
     ${QT_QTGUI_INCLUDE_DIR}

diff --git a/tools/testapp/main.cpp b/tests/testapp/main.cpp
similarity index 100%
rename from tools/testapp/main.cpp
rename to tests/testapp/main.cpp

diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
deleted file mode 100644 (file)
index 842e7cc..0000000
--- a/tools/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-add_subdirectory(testapp)