diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2021-09-13 15:36:51 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2021-09-13 17:03:55 +0200 |
| commit | 3d4d7c7e14ec543f5e023116ffa7d12364b5ed7d (patch) | |
| tree | b082bad4484f2758c4bdc7a4d2b5ffafe6f7ae6a /src/app/CMakeLists.txt | |
| parent | c941f7d0f5beff0c40050e61ccaa2ac3088a14c5 (diff) | |
| parent | 7e965629b0bbd463c70f561f6c4bddccd2fd9ae4 (diff) | |
Merge remote-tracking branch 'origin/5.0'
Conflicts:
src/plugins/clangtools/clangtoolssettings.cpp
src/plugins/clangtools/executableinfo.cpp
src/plugins/clangtools/executableinfo.h
Change-Id: Id8caf63e3e594792467d3447870086bd2d8f73b9
Diffstat (limited to 'src/app/CMakeLists.txt')
| -rw-r--r-- | src/app/CMakeLists.txt | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt index d2044634ae..236421558c 100644 --- a/src/app/CMakeLists.txt +++ b/src/app/CMakeLists.txt @@ -1,5 +1,9 @@ configure_file(app_version.h.cmakein app_version.h ESCAPE_QUOTES) +if(NOT IS_ABSOLUTE "${IDE_ICON_PATH}") + set(IDE_ICON_PATH "${CMAKE_CURRENT_SOURCE_DIR}/${IDE_ICON_PATH}") +endif() + install( FILES ${CMAKE_CURRENT_BINARY_DIR}/app_version.h DESTINATION ${IDE_HEADER_INSTALL_PATH}/src/app @@ -39,6 +43,7 @@ if (WIN32) RC_VERSION=${RC_VERSION} RC_VERSION_STRING=${RC_VERSION_STRING} RC_COPYRIGHT=${RC_COPYRIGHT} + RC_ICON_PATH=${IDE_ICON_PATH} ) target_sources(qtcreator PRIVATE qtcreator.rc) @@ -57,7 +62,7 @@ if (APPLE) COMMAND xcrun actool --app-icon qtcreator --output-partial-info-plist "${CMAKE_CURRENT_BINARY_DIR}/qtcreator.Info.plist" --platform macosx --minimum-deployment-target 10.7 --compile "${CMAKE_CURRENT_BINARY_DIR}" - "${CMAKE_CURRENT_SOURCE_DIR}/qtcreator.xcassets" + "${IDE_ICON_PATH}/qtcreator.xcassets" > /dev/null BYPRODUCTS qtcreator.Info.plist VERBATIM |