From: José Fonseca <jose.r.fonseca@gmail.com>
Date: Thu, 21 Apr 2011 07:24:57 +0000 (+0100)
Subject: Put all executables into the same to level build directory.
X-Git-Url: https://git.cworth.org/git?a=commitdiff_plain;h=44721298c9754fd2f67eeca37e2351f27f6e9611;p=apitrace

Put all executables into the same to level build directory.
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a25357d..253d27d 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -77,6 +77,10 @@ else ()
     add_definitions (-Wno-sign-compare) # comparison between signed and unsigned integer expressions
 endif ()
 
+# Put all executables into the same top level build directory, regardless of
+# which subdirectory they are declared
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
+
 # Use bundled ZLIB if system one can't be found
 if (ZLIB_FOUND)
     include_directories (${ZLIB_INCLUDE_DIRS})
diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt
index b8d5a69..611ab9b 100644
--- a/gui/CMakeLists.txt
+++ b/gui/CMakeLists.txt
@@ -47,7 +47,7 @@ QT4_WRAP_UI(qapitrace_UIS_H ${qapitrace_UIS})
 link_directories(${LINK_DIRECTORIES} ${QJSON_LIBRARY_DIRS})
 include_directories(${QT_INCLUDES} ${QJSON_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/..)
 
-add_definitions(-DBUILD_DIR="${CMAKE_CURRENT_BINARY_DIR}/..")
+add_definitions(-DBUILD_DIR="${CMAKE_BINARY_DIR}")
 
 add_executable(qapitrace ${qapitrace_SRCS} ${qapitrace_UIS_H})