CMake: Allow Windows to build Lib/Test GUI targets

This commit is contained in:
ayeteadoe 2025-06-23 23:48:06 -07:00 committed by Andrew Kaster
parent 8828e0d791
commit 91e7664849
2 changed files with 5 additions and 6 deletions

View File

@ -62,7 +62,7 @@ if (ANDROID AND ENABLE_QT)
set(ENABLE_QT OFF CACHE BOOL "" FORCE)
endif()
if (ENABLE_QT AND ENABLE_GUI_TARGETS)
if (ENABLE_QT AND ENABLE_GUI_TARGETS AND (NOT WIN32 OR NOT ENABLE_WINDOWS_CI))
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)
set(CMAKE_AUTOUIC ON)
@ -74,7 +74,7 @@ find_package(OpenSSL REQUIRED)
include(CTest) # for BUILD_TESTING option, default ON
if (ENABLE_GUI_TARGETS)
if (ENABLE_GUI_TARGETS AND (NOT WIN32 OR NOT ENABLE_WINDOWS_CI))
add_subdirectory(Services)
add_subdirectory(UI)
endif()

View File

@ -51,9 +51,7 @@
},
"cacheVariables": {
"CMAKE_C_COMPILER": "clang-cl",
"CMAKE_CXX_COMPILER": "clang-cl",
"ENABLE_QT": "OFF",
"ENABLE_GUI_TARGETS": "OFF"
"CMAKE_CXX_COMPILER": "clang-cl"
},
"vendor": {
"microsoft.com/VisualStudioSettings/CMake/1.0": {
@ -156,7 +154,8 @@
],
"displayName": "Windows CI Config",
"cacheVariables": {
"ENABLE_WINDOWS_CI": "ON"
"ENABLE_WINDOWS_CI": "ON",
"ENABLE_QT": "OFF"
}
},
{