Put all executables into the same to level build directory.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a25357d24c46c0d7d80fa72184e222c7e5428ef9..253d27d35a0460b84fa62fe39abf35750c8bcfac 100755 (executable)
--- 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 b8d5a6908b39f0a8d65f4d6097746988881d6302..611ab9bc8170ea0d04799dc344c243879266cbe7 100644 (file)
--- 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})