summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@qt.io>2019-03-18 18:49:04 +0100
committerTobias Hunger <tobias.hunger@qt.io>2019-03-20 10:38:32 +0000
commitb173f0b905155b4e17160c5ea44f7625599f7fcb (patch)
tree2e6809bd4465505455f66db6fde485c4f1230803
parenta9af99c926a4f7da597a965923328cfdc112004a (diff)
CMake: Treat OUTPUT_DIRECTORY as relative to top level build directory
Treat a relative path in OUTPUT_DIRECTORY as relative to the top level build directory, not to the current build directory. Change-Id: I4d409d1362a8f73d13b93cf5ab98e82e60dd62cb Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
-rw-r--r--cmake/QtBuild.cmake3
1 files changed, 3 insertions, 0 deletions
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake
index 1bbe12d830..ffa0432edb 100644
--- a/cmake/QtBuild.cmake
+++ b/cmake/QtBuild.cmake
@@ -752,6 +752,9 @@ function(add_qt_executable name)
set(arg_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${INSTALL_BINDIR}")
endif()
+ get_filename_component(arg_OUTPUT_DIRECTORY "${arg_OUTPUT_DIRECTORY}"
+ ABSOLUTE BASE_DIR "${CMAKE_BINARY_DIR}")
+
add_executable("${name}" ${arg_EXE_FLAGS})
qt_autogen_tools("${name}"