CMakeLists: Simplified macOS universal build code.
This commit is contained in:
parent
7746042e63
commit
290dfe05c3
|
@ -9,8 +9,9 @@ cmake_path(SET QT_SDK_DIR NORMALIZE ${QT_SDK_DIR})
|
||||||
option(RIBBONUI_BUILD_EXAMPLES "Build RibbonUI APP." ON)
|
option(RIBBONUI_BUILD_EXAMPLES "Build RibbonUI APP." ON)
|
||||||
option(RIBBONUI_BUILD_QWINDOWKIT "Build QWindowKit." ON)
|
option(RIBBONUI_BUILD_QWINDOWKIT "Build QWindowKit." ON)
|
||||||
option(RIBBONUI_BUILD_STATIC_LIB "Build RibbonUI static library." OFF)
|
option(RIBBONUI_BUILD_STATIC_LIB "Build RibbonUI static library." OFF)
|
||||||
|
option(RIBBONUI_UNIVERSAL_BUILD_MACOS "Universal build RibbonUI for macOS." ON)
|
||||||
|
|
||||||
if(APPLE)
|
if(APPLE AND RIBBONUI_UNIVERSAL_BUILD_MACOS)
|
||||||
set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "" FORCE)
|
set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "" FORCE)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
@ -38,5 +39,6 @@ message("---------------------------- RibbonUI ----------------------------")
|
||||||
message("Build RibbonUI APP: ${RIBBONUI_BUILD_EXAMPLES}")
|
message("Build RibbonUI APP: ${RIBBONUI_BUILD_EXAMPLES}")
|
||||||
message("Build RibbonUI static library: ${RIBBONUI_BUILD_STATIC_LIB}")
|
message("Build RibbonUI static library: ${RIBBONUI_BUILD_STATIC_LIB}")
|
||||||
message("Build QWindowKit: ${RIBBONUI_BUILD_QWINDOWKIT}")
|
message("Build QWindowKit: ${RIBBONUI_BUILD_QWINDOWKIT}")
|
||||||
|
message("Universal build RibbonUI for macOS: ${RIBBONUI_UNIVERSAL_BUILD_MACOS}")
|
||||||
message("RibbonUI QML Plugin Path: ${RIBBONUI_QML_PLUGIN_DIRECTORY}")
|
message("RibbonUI QML Plugin Path: ${RIBBONUI_QML_PLUGIN_DIRECTORY}")
|
||||||
message("------------------------------------------------------------------")
|
message("------------------------------------------------------------------")
|
||||||
|
|
|
@ -15,10 +15,6 @@ else()
|
||||||
set(CMAKE_AUTOUIC ON)
|
set(CMAKE_AUTOUIC ON)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(APPLE)
|
|
||||||
set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "" FORCE)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
string(TIMESTAMP TIME_YEAR %Y)
|
string(TIMESTAMP TIME_YEAR %Y)
|
||||||
set(PROJECT_COMPANY "Mentalflow's Lab")
|
set(PROJECT_COMPANY "Mentalflow's Lab")
|
||||||
set(PROJECT_COPYRIGHT "Copyright (c) ${TIME_YEAR} Mentalflow's Lab. All rights reserved.")
|
set(PROJECT_COPYRIGHT "Copyright (c) ${TIME_YEAR} Mentalflow's Lab. All rights reserved.")
|
||||||
|
|
|
@ -16,10 +16,6 @@ else()
|
||||||
set(CMAKE_AUTOUIC ON)
|
set(CMAKE_AUTOUIC ON)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(APPLE)
|
|
||||||
set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "" FORCE)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
find_package(Qt6 COMPONENTS Core Quick Qml REQUIRED)
|
find_package(Qt6 COMPONENTS Core Quick Qml REQUIRED)
|
||||||
|
|
||||||
set(version_str "${PROJECT_VERSION_MAJOR},${PROJECT_VERSION_MINOR},${PROJECT_VERSION_PATCH}")
|
set(version_str "${PROJECT_VERSION_MAJOR},${PROJECT_VERSION_MINOR},${PROJECT_VERSION_PATCH}")
|
||||||
|
|
Loading…
Reference in New Issue