diff options
author | Eike Ziller <eike.ziller@qt.io> | 2019-06-21 14:40:34 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2019-06-21 13:30:04 +0000 |
commit | f4acc2f1629a6b323b8d263521949a54b89841f4 (patch) | |
tree | 9598f6535e2209aefd9b9f096d8f81526835a52e /CMakeLists.txt | |
parent | a47975b8faf23e27024692433f871adb6c6b5a9a (diff) |
CMake build: Allow branding
Create your own QtCreatorIDEBranding.cmake somewhere and point cmake to
it via CMAKE_MODULE_PATH
Task-number: QTCREATORBUG-22488
Change-Id: Ic1057d879c5104b57e4ed8ef8a9c4fc8d4140de9
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 26 |
1 files changed, 6 insertions, 20 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 73800c329d..46ab6b8da7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,21 +1,10 @@ cmake_minimum_required(VERSION 3.9) -include(FeatureSummary) - -#BINARY_ARTIFACTS_BRANCH = master -#PROJECT_USER_FILE_EXTENSION = .user - -set(IDE_VERSION "4.9.83") # The IDE version. -set(IDE_VERSION_COMPAT "4.9.83") # The IDE Compatibility version. -set(IDE_VERSION_DISPLAY "4.10.0-beta2") # The IDE display version. -set(IDE_COPYRIGHT_YEAR "2019") # The IDE copyright year. +## Add paths to check for cmake modules: +list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") -set(IDE_SETTINGSVARIANT "QtProject") # The IDE settings variation. -set(IDE_COPY_SETTINGSVARIANT "Nokia") # The IDE settings to initially import. -set(IDE_DISPLAY_NAME "Qt Creator") # The IDE display name. -set(IDE_ID "qtcreator") # The IDE id (no spaces, lowercase!) -set(IDE_CASED_ID "QtCreator") # The cased IDE id (no spaces!) -set(IDE_BUNDLE_IDENTIFIER "org.qt-project.${IDE_ID}") # The macOS application bundle identifier. +include(FeatureSummary) +include(QtCreatorIDEBranding) set(IDE_REVISION FALSE CACHE BOOL "Marks the presence of IDE revision string.") set(IDE_REVISION_STR "" CACHE STRING "The IDE revision string.") @@ -24,9 +13,6 @@ mark_as_advanced(IDE_REVISION IDE_REVISION_STR) project(QtCreator VERSION ${IDE_VERSION}) -## Add paths to check for cmake modules: -list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") - # Force C++ standard, do not fall back, do not use compiler extensions set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD_REQUIRED ON) @@ -126,7 +112,7 @@ endif() set(_IDE_APP_PATH "bin") if (APPLE) - set(_IDE_APP_TARGET "Qt Creator") + set(_IDE_APP_TARGET "${IDE_DISPLAY_NAME}") set(_IDE_OUTPUT_PATH "${_IDE_APP_PATH}/${_IDE_APP_TARGET}.app/Contents") @@ -138,7 +124,7 @@ if (APPLE) set(_IDE_DOC_PATH "${_IDE_OUTPUT_PATH}/Resources/doc") set(_IDE_BIN_PATH "${_IDE_OUTPUT_PATH}/MacOS") else () - set(_IDE_APP_TARGET "qtcreator") + set(_IDE_APP_TARGET "${IDE_ID}") set(_IDE_LIBRARY_BASE_PATH "lib") set(_IDE_LIBRARY_PATH "lib/qtcreator") |