Wireshark-commits: [Wireshark-commits] master-2.6 a226168: CMake: try to fix duplicate qm builds on
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Mon, 25 Jun 2018 22:01:46 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=a226168d5503abacd0aaffec39901dbbb5164df6
Submitter: Pascal Quantin (pascal.quantin@xxxxxxxxx)
Changed: branch: master-2.6
Repository: wireshark

Commits:

a226168 by Peter Wu (peter@xxxxxxxxxxxxx):

    CMake: try to fix duplicate qm builds on Windows
    
    The Windows buildbot showed that .qm files are generated twice. This
    resulted in rebuilding i18n.cpp, which resulted in rebuilding qtui,
    which finally resulted in Wireshark.exe being built twice for no reason.
    
    Assuming it is the same issue as commit v2.3.0rc0-3078-gaa9a0b3bf8,
    avoid having multiple targets depend on the same output (.qm files).
    This patch requires CMake 3.1 or newer.
    
    For master-2.6 backport, limit the change to WIN32 platform (as we already
    require CMake 3.7 as minimum).
    
    Change-Id: Iffd8946701553b89c09504278afa4b16d2a0b5b4
    Fixes: v2.5.0rc0-1366-gdfa893b1cf ("cmake: set CMAKE_AUTOUIC and CMAKE_AUTORCC to avoid CMP0071 warning")
    Reviewed-on: https://code.wireshark.org/review/27620
    Petri-Dish: Peter Wu <peter@xxxxxxxxxxxxx>
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
    (cherry picked from commit 644939ed9e4e5449970e27a674a6936723daed5c)
    Reviewed-on: https://code.wireshark.org/review/28434
    Reviewed-by: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    

Actions performed:

    from  c292e18   Update shared library package names
    adds  a226168   CMake: try to fix duplicate qm builds on Windows


Summary of changes:
 ui/qt/CMakeLists.txt | 10 ++++++++++
 1 file changed, 10 insertions(+)