Wireshark-commits: [Wireshark-commits] master 38d3e06: CMake: Add a build environment == generator

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Fri, 10 Apr 2015 09:34:01 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=38d3e063d3fb3d007e61b5e8681372c247171218
Submitter: Graham Bloice (graham.bloice@xxxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

38d3e06 by Gerald Combs (gerald@xxxxxxxxxxxxx):

    CMake: Add a build environment == generator check.
    
    If we're building on Windows and %Platform% is "x64" or undefined,
    check it against our generator's target platform.
    
    Update the "${CMAKE_GENERATOR} MATCHES" regexes to match what CMake
    uses internally.
    
    Change-Id: I33996344978855cbdf7c1ee9e55b7340efea5b5c
    Reviewed-on: https://code.wireshark.org/review/7994
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Petri-Dish: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Graham Bloice <graham.bloice@xxxxxxxxxxxxx>
    

Actions performed:

    from  8c0f09e   MIP6: Remove proto_tree_add_text
    adds  38d3e06   CMake: Add a build environment == generator check.


Summary of changes:
 CMakeLists.txt |   18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)