diff options
| author | Gerald Combs <gerald@zing.org> | 2021-05-25 14:04:51 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2021-05-25 21:58:05 +0000 |
| commit | 13546c7a183b73e74ffc99bde19cb4b0f5f0f910 (patch) | |
| tree | f3d8c8454018a2efc9e9cb8e008100f53f8479c3 | |
| parent | 113062025d93065bad2c340d992f06852899195a (diff) | |
CMake: Update autogen properties.
Set the AUTOMOC, AUTOUIC, and AUTORCC properties for the qtui and
wireshark targets to match what we currently do in master. This should
keep us from running moc and uic on unwanted targets.
| -rw-r--r-- | CMakeLists.txt | 9 | ||||
| -rw-r--r-- | ui/qt/CMakeLists.txt | 3 |
2 files changed, 6 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 132ab64661..f3d88a340f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1115,12 +1115,6 @@ ws_find_package(Systemd BUILD_sdjournal HAVE_SYSTEMD) # Build the Qt GUI? if(BUILD_wireshark) - if(NOT CMAKE_VERSION VERSION_LESS "3.10.0") - set(CMAKE_AUTOMOC ON) - set(CMAKE_AUTOUIC ON) - set(CMAKE_AUTORCC ON) - endif() - # Untested, may not work if CMAKE_PREFIX_PATH gets overwritten # somewhere. The if WIN32 in this place is annoying as well. if(WIN32) @@ -2387,6 +2381,9 @@ if(BUILD_wireshark AND QT_FOUND) LINK_FLAGS "${WS_LINK_FLAGS}" FOLDER "Executables" INSTALL_RPATH "${EXECUTABLE_INSTALL_RPATH}" + AUTOMOC ON + AUTOUIC ON + AUTORCC ON ) if(ENABLE_APPLICATION_BUNDLE OR WIN32) set_target_properties(wireshark PROPERTIES OUTPUT_NAME Wireshark) diff --git a/ui/qt/CMakeLists.txt b/ui/qt/CMakeLists.txt index 1bcbe318d9..5c179e2d8a 100644 --- a/ui/qt/CMakeLists.txt +++ b/ui/qt/CMakeLists.txt @@ -728,6 +728,9 @@ target_compile_definitions(qtui set_target_properties(qtui PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}" FOLDER "UI" + AUTOMOC ON + AUTOUIC ON + AUTORCC ON # Ensure .qm files are generated before autogenerating i18n.qrc AUTOGEN_TARGET_DEPENDS "${WIRESHARK_QT_QM}" ) |