From 54c5fa6b3ec6b586daf42099b0e007b70eccf446 Mon Sep 17 00:00:00 2001 From: lvaatamoinen Date: Wed, 13 Jan 2010 11:16:46 +0000 Subject: [PATCH] - Corrected CMakeLists.txt files to allow proper out-of-source build (separate build-directory trees can be now used) - Commented out utest build from toplevel CMakeLists.txt git-svn-id: file:///svnroot/qtrapids/trunk@61 42ac0dd5-4c8c-4c71-bb3e-ecdfe252ffda --- CMakeLists.txt | 2 +- dbus/CMakeLists.txt | 2 +- src/client/CMakeLists.txt | 2 +- src/server/CMakeLists.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bd61dcd..38d7cf4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,5 +9,5 @@ find_package(Qt4 REQUIRED) add_subdirectory(./dbus) add_subdirectory(./src/client) add_subdirectory(./src/server) -add_subdirectory(./src/utest) +#add_subdirectory(./src/utest) diff --git a/dbus/CMakeLists.txt b/dbus/CMakeLists.txt index 4a4c67c..3a5d329 100644 --- a/dbus/CMakeLists.txt +++ b/dbus/CMakeLists.txt @@ -1,4 +1,4 @@ -SET(SOURCES com.ixonos.qtrapids.xml) +SET(SOURCES ${CMAKE_HOME_DIRECTORY}/dbus/com.ixonos.qtrapids.xml) SET(PROXY_SRC proxy.h proxy.cpp) SET(SERVER_SRC server.h server.cpp) diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt index f5148b9..38cc9c0 100644 --- a/src/client/CMakeLists.txt +++ b/src/client/CMakeLists.txt @@ -14,7 +14,7 @@ INCLUDE_DIRECTORIES( ${QT_QTGUI} ) -SET_SOURCE_FILES_PROPERTIES(./proxy.cpp ./proxy.h PROPERTIES GENERATED 1) +SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_SOURCE_DIR}/proxy.cpp ${CMAKE_CURRENT_SOURCE_DIR}/proxy.h PROPERTIES GENERATED 1) SET(MOC_HEADERS ./DownloadView.h diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt index 60bb5d0..6b6c797 100644 --- a/src/server/CMakeLists.txt +++ b/src/server/CMakeLists.txt @@ -13,7 +13,7 @@ INCLUDE_DIRECTORIES( ${QT_QTSQL_INCLUDE_DIR} ) -SET_SOURCE_FILES_PROPERTIES(./server.cpp ./server.h PROPERTIES GENERATED 1) +SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_SOURCE_DIR}/server.cpp ${CMAKE_CURRENT_SOURCE_DIR}/server.h PROPERTIES GENERATED 1) SET(MOC_HEADERS ./AlertWaiterThread.hpp -- 1.7.9.5