Wireshark-commits: [Wireshark-commits] master 6dfcbed: CMake: Make "install ... DESTINATION" paths
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: Fri, 18 Dec 2015 17:05:22 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=6dfcbedde9b8d9394900afe016fcde08a32de4ca
Submitter: Michael Mann (mmann78@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

6dfcbed by Gerald Combs (gerald@xxxxxxxxxxxxx):

    CMake: Make "install ... DESTINATION" paths relative.
    
    Make sure we use relative destination paths in each install
    command. Apparently many CPack generators don't support absolute paths,
    particularly on Windows. This fixes the following error when running
    `cpack -G WIX` here:
    
    ----
    CPack: Create package using WIX
    CPack: Install projects
    CPack: - Install project: Wireshark
    CMake Error at C:/Development/wireshark/cmbuild/cmake_install.cmake:206 (message):
      ABSOLUTE path INSTALL DESTINATION forbidden (by caller): C:/Program Files/Wireshark/lib/wireshark/extcap/androiddump.exe
    
    CPack Error: Error when generating package: wireshark
    ----
    
    Change-Id: Ifdcd40814df8163ea722a65ef55acc1a511b2f75
    Reviewed-on: https://code.wireshark.org/review/12657
    Petri-Dish: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Balint Reczey <balint@xxxxxxxxxxxxxxx>
    

Actions performed:

    from  05c47d7   [NFS] adding stateid hash based on stateid.other
    adds  6dfcbed   CMake: Make "install ... DESTINATION" paths relative.


Summary of changes:
 CMakeLists.txt |   28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)