diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-11-11 12:58:11 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-11-11 12:58:11 +0100 |
| commit | 646c7860cb95fd7e6c36aa640ea1a2f5fde7d59a (patch) | |
| tree | 727866c9ea7a22f61978e56212e5fd99726b128d /cmake | |
| parent | a5044727900b3db78746ae17f72d20da1fd3a8ca (diff) | |
| parent | c6115771f9b71e065cb49328bf9d387d327ac996 (diff) | |
| download | qt-creator-646c7860cb95fd7e6c36aa640ea1a2f5fde7d59a.tar.gz | |
Merge remote-tracking branch 'origin/4.11'
Conflicts:
src/plugins/genericprojectmanager/genericprojectplugin.cpp
src/plugins/projectexplorer/environmentaspect.cpp
src/plugins/projectexplorer/environmentaspect.h
src/plugins/projectexplorer/environmentaspectwidget.cpp
Change-Id: Id21d62cf14419febd1e06c9b429fcdf4501c0eaf
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtCreatorAPI.cmake | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/cmake/QtCreatorAPI.cmake b/cmake/QtCreatorAPI.cmake index 35ba699ee0..27e6cfd7ab 100644 --- a/cmake/QtCreatorAPI.cmake +++ b/cmake/QtCreatorAPI.cmake @@ -38,7 +38,7 @@ if (APPLE) set(_IDE_PLUGIN_PATH "${_IDE_OUTPUT_PATH}/PlugIns") set(_IDE_LIBRARY_BASE_PATH "Frameworks") set(_IDE_LIBRARY_PATH "${_IDE_OUTPUT_PATH}/Frameworks") - set(_IDE_LIBEXEC_PATH "${_IDE_OUTPUT_PATH}/Resources") + set(_IDE_LIBEXEC_PATH "${_IDE_OUTPUT_PATH}/Resources/libexec") set(_IDE_DATA_PATH "${_IDE_OUTPUT_PATH}/Resources") set(_IDE_DOC_PATH "${_IDE_OUTPUT_PATH}/Resources/doc") set(_IDE_BIN_PATH "${_IDE_OUTPUT_PATH}/MacOS") @@ -178,8 +178,12 @@ function(separate_object_libraries libraries REGULAR_LIBS OBJECT_LIBS OBJECT_LIB endfunction(separate_object_libraries) function(set_explicit_moc target_name file) + unset(file_dependencies) + if (file MATCHES "^.*plugin.h$") + set(file_dependencies DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/${target_name}.json") + endif() set_property(SOURCE "${file}" PROPERTY SKIP_AUTOMOC ON) - qt5_wrap_cpp(file_moc "${file}") + qt5_wrap_cpp(file_moc "${file}" ${file_dependencies}) target_sources(${target_name} PRIVATE "${file_moc}") endfunction() |