diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-08-22 09:53:37 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-08-22 09:53:37 +0200 |
| commit | 30143478f3a15c0e6d9a731730b66d78f1ae334a (patch) | |
| tree | 1178feb634379c1bf705e6ad8d778539618647c3 /cmake | |
| parent | d0bdfad93284ec8de3026d21ae3d845318e317fc (diff) | |
| parent | 8cd7a119262c226e575c0beda45a1af71a32baf5 (diff) | |
| download | qt-creator-30143478f3a15c0e6d9a731730b66d78f1ae334a.tar.gz | |
Merge remote-tracking branch 'origin/4.10'
Conflicts:
src/libs/utils/consoleprocess_win.cpp
Change-Id: Ibdc265eed2f7080726e11ff6f2931c8559943af2
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtCreatorAPI.cmake | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/cmake/QtCreatorAPI.cmake b/cmake/QtCreatorAPI.cmake index fddabb8d93..80f8660d08 100644 --- a/cmake/QtCreatorAPI.cmake +++ b/cmake/QtCreatorAPI.cmake @@ -286,6 +286,14 @@ function(enable_pch target) endif() endfunction() +function(qtc_output_binary_dir varName) + if (QTC_MERGE_BINARY_DIR) + set(${varName} ${QtCreator_BINARY_DIR} PARENT_SCOPE) + else() + set(${varName} ${PROJECT_BINARY_DIR} PARENT_SCOPE) + endif() +endfunction() + # # Public API functions # @@ -354,6 +362,7 @@ function(add_qtc_library name) set_property(SOURCE ${file} PROPERTY SKIP_AUTOMOC ON) endforeach() + qtc_output_binary_dir(_output_binary_dir) set_target_properties(${name} PROPERTIES SOURCES_DIR "${CMAKE_CURRENT_SOURCE_DIR}" VERSION "${IDE_VERSION}" @@ -361,9 +370,9 @@ function(add_qtc_library name) VISIBILITY_INLINES_HIDDEN ON BUILD_RPATH "${_LIB_RPATH}" INSTALL_RPATH "${_LIB_RPATH}" - RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/${IDE_BIN_PATH}" - LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/${IDE_LIBRARY_PATH}" - ARCHIVE_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/${IDE_LIBRARY_PATH}" + RUNTIME_OUTPUT_DIRECTORY "${_output_binary_dir}/${IDE_BIN_PATH}" + LIBRARY_OUTPUT_DIRECTORY "${_output_binary_dir}/${IDE_LIBRARY_PATH}" + ARCHIVE_OUTPUT_DIRECTORY "${_output_binary_dir}/${IDE_LIBRARY_PATH}" ${_arg_PROPERTIES} ) enable_pch(${name}) @@ -557,6 +566,7 @@ function(add_qtc_plugin target_name) set(plugin_dir "${_arg_PLUGIN_PATH}") endif() + qtc_output_binary_dir(_output_binary_dir) set_target_properties(${target_name} PROPERTIES SOURCES_DIR "${CMAKE_CURRENT_SOURCE_DIR}" CXX_VISIBILITY_PRESET hidden @@ -565,9 +575,9 @@ function(add_qtc_plugin target_name) _arg_VERSION "${_arg_VERSION}" BUILD_RPATH "${_PLUGIN_RPATH}" INSTALL_RPATH "${_PLUGIN_RPATH}" - LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/${plugin_dir}" - ARCHIVE_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/${plugin_dir}" - RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/${plugin_dir}" + LIBRARY_OUTPUT_DIRECTORY "${_output_binary_dir}/${plugin_dir}" + ARCHIVE_OUTPUT_DIRECTORY "${_output_binary_dir}/${plugin_dir}" + RUNTIME_OUTPUT_DIRECTORY "${_output_binary_dir}/${plugin_dir}" OUTPUT_NAME "${name}" ${_arg_PROPERTIES} ) @@ -703,10 +713,11 @@ function(add_qtc_executable name) target_include_directories("${name}" PRIVATE "${CMAKE_BINARY_DIR}/src" ${_arg_INCLUDES}) target_compile_definitions("${name}" PRIVATE ${_arg_DEFINES} ${TEST_DEFINES} ${DEFAULT_DEFINES}) target_link_libraries("${name}" PRIVATE ${_arg_DEPENDS} ${_TEST_DEPENDS}) + qtc_output_binary_dir(_output_binary_dir) set_target_properties("${name}" PROPERTIES BUILD_RPATH "${_RPATH_BASE}/${_RELATIVE_LIB_PATH}" INSTALL_RPATH "${_RPATH_BASE}/${_RELATIVE_LIB_PATH}" - RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/${_DESTINATION}" + RUNTIME_OUTPUT_DIRECTORY "${_output_binary_dir}/${_DESTINATION}" ${_arg_PROPERTIES} ) enable_pch(${name}) |