forked from osmocom/wireshark
CMake: Enable AUTO{MOC,UIC,RCC} according to our CMake version.
As noted inbe2b0fc810
, we need to set CMAKE_AUTO* before searching for Qt packages when using 3.20.0 and later. However, this fails if we're using CMake 3.9.6 or earlier. Set CMAKE_AUTO* where needed depending on our CMake version. Ping #17314. (cherry picked from commita80ea46ff7
) Conflicts: ui/qt/CMakeLists.txt
This commit is contained in:
parent
eee907aeb5
commit
19d03ef4ac
|
@ -1115,9 +1115,11 @@ 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.
|
||||
|
|
|
@ -631,6 +631,12 @@ include_directories(
|
|||
${CMAKE_CURRENT_SOURCE_DIR}
|
||||
)
|
||||
|
||||
if(CMAKE_VERSION VERSION_LESS "3.10.0")
|
||||
set(CMAKE_AUTOMOC ON)
|
||||
set(CMAKE_AUTOUIC ON)
|
||||
set(CMAKE_AUTORCC ON)
|
||||
endif()
|
||||
|
||||
if(NOT Qt5Widgets_VERSION VERSION_LESS "5.9")
|
||||
# Drop the file modification time of source files from generated files
|
||||
# to help with reproducible builds. We do not use QFileInfo.lastModified
|
||||
|
|
Loading…
Reference in New Issue