Ladybird: Only set AUTO{MOC,RCC} for targets that need it

No target needs AUTOUIC, so remove it.
This commit is contained in:
Sönke Holz committed 2025-08-10 17:38:01 +02:00
1 parent fc49068a9e
commit 24a18a27fc
5 files changed
+4 -16

No files matched your search

+2 -7
View File
@@ -85,13 +85,6 @@ else()
serenity_option(ENABLE_QT ON CACHE BOOL "Build ladybird application using Qt GUI")
endif()
if (ENABLE_QT)
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)
set(CMAKE_AUTOUIC ON)
find_package(Qt6 REQUIRED COMPONENTS Core Widgets Network)
endif()
set(SOURCES
HelperProcess.cpp
Utilities.cpp
@@ -103,6 +96,7 @@ set(LADYBIRD_HEADERS
)
if (ENABLE_QT)
find_package(Qt6 REQUIRED COMPONENTS Core Widgets Network)
qt_add_executable(ladybird ${SOURCES})
target_sources(ladybird PRIVATE
Qt/Application.cpp
@@ -126,6 +120,7 @@ if (ENABLE_QT)
Qt/main.cpp
)
target_link_libraries(ladybird PRIVATE Qt::Core Qt::Gui Qt::Network Qt::Widgets)
set_target_properties(ladybird PROPERTIES AUTOMOC ON AUTORCC ON)
elseif (APPLE)
add_executable(ladybird MACOSX_BUNDLE
${SOURCES}
-4
View File
@@ -1,9 +1,5 @@
set(IMAGE_DECODER_SOURCE_DIR ${SERENITY_SOURCE_DIR}/Userland/Services/ImageDecoder)
set(CMAKE_AUTOMOC OFF)
set(CMAKE_AUTORCC OFF)
set(CMAKE_AUTOUIC OFF)
set(IMAGE_DECODER_SOURCES
${IMAGE_DECODER_SOURCE_DIR}/ConnectionFromClient.cpp
)
-4
View File
@@ -1,9 +1,5 @@
set(REQUESTSERVER_SOURCE_DIR ${SERENITY_SOURCE_DIR}/Userland/Services/RequestServer)
set(CMAKE_AUTOMOC OFF)
set(CMAKE_AUTORCC OFF)
set(CMAKE_AUTOUIC OFF)
set(REQUESTSERVER_SOURCES
${REQUESTSERVER_SOURCE_DIR}/ConnectionFromClient.cpp
${REQUESTSERVER_SOURCE_DIR}/ConnectionCache.cpp
+1
View File
@@ -27,6 +27,7 @@ if (ENABLE_QT)
)
target_link_libraries(WebContent PRIVATE Qt::Core Qt::Network)
target_compile_definitions(WebContent PRIVATE HAVE_QT=1)
set_target_properties(WebContent PROPERTIES AUTOMOC ON)
if (NOT HAVE_PULSEAUDIO)
find_package(Qt6 REQUIRED COMPONENTS Multimedia)
+1 -1
View File
@@ -9,7 +9,6 @@ set(WEBWORKER_SOURCES
)
add_library(webworker STATIC ${WEBWORKER_SOURCES})
set_target_properties(webworker PROPERTIES AUTOMOC OFF AUTORCC OFF AUTOUIC OFF)
target_include_directories(webworker PRIVATE ${SERENITY_SOURCE_DIR}/Userland/Services/)
target_include_directories(webworker PRIVATE ${SERENITY_SOURCE_DIR}/Userland/)
@@ -29,6 +28,7 @@ if (ENABLE_QT)
target_link_libraries(WebWorker PRIVATE Qt::Core Qt::Network)
target_link_libraries(WebWorker PRIVATE webworker LibWebSocket)
target_compile_definitions(WebWorker PRIVATE HAVE_QT=1)
set_target_properties(WebWorker PROPERTIES AUTOMOC ON)
else()
add_executable(WebWorker main.cpp)