aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Wu <peter@lekensteyn.nl>2017-10-20 01:13:31 +0100
committerPeter Wu <peter@lekensteyn.nl>2017-10-20 03:00:57 +0000
commit4273eced0c24442e5e713762e97cba5457b23284 (patch)
tree92d8600aedb636398545048fb3bc4151c2744342
parentfd1d13567d07bb429f9209c4c11a97c7ba02dab8 (diff)
cmake: fix Qt build with CMake 3.0.0 and 3.0.1
AUTOUIC fails to generate some ui_*.h files because of a bug that was fixed in CMake 3.0.2: https://cmake.org/Bug/view.php?id=14981 Change-Id: I964d991c7edefcea55ae43b0768a7fd3503f94a9 Fixes: v2.5.0rc0-1366-gdfa893b1cf ("cmake: set CMAKE_AUTOUIC and CMAKE_AUTORCC to avoid CMP0071 warning") Reviewed-on: https://code.wireshark.org/review/23993 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-rw-r--r--ui/qt/CMakeLists.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/qt/CMakeLists.txt b/ui/qt/CMakeLists.txt
index 0ca03c4..565fa0b 100644
--- a/ui/qt/CMakeLists.txt
+++ b/ui/qt/CMakeLists.txt
@@ -556,7 +556,7 @@ include_directories(
SET(CMAKE_AUTOMOC TRUE)
-if(CMAKE_VERSION VERSION_LESS "3.0")
+if(CMAKE_VERSION VERSION_LESS "3.0.2")
# AUTOUIC and AUTORCC are not supported in CMAKE 2.8.x
if (QT_VERSION EQUAL 5)
QT5_ADD_TRANSLATION(WIRESHARK_QT_QM ${WIRESHARK_QT_TS})
@@ -631,7 +631,7 @@ set_target_properties(qtui PROPERTIES
LINK_FLAGS "${WS_LINK_FLAGS}"
FOLDER "UI"
)
-if(NOT CMAKE_VERSION VERSION_LESS "3.0")
+if(NOT CMAKE_VERSION VERSION_LESS "3.0.2")
# Ensure .qm files are generated before autogenerating i18n.qrc
set_target_properties(qtui PROPERTIES
AUTOGEN_TARGET_DEPENDS "${WIRESHARK_QT_QM}"