diff options
author | Graham Bloice <graham.bloice@trihedral.com> | 2015-07-05 12:47:15 +0100 |
---|---|---|
committer | Graham Bloice <graham.bloice@trihedral.com> | 2015-07-05 16:36:53 +0000 |
commit | c00e4697e2003349afdc56cb4d3a853fac63fcbe (patch) | |
tree | 2c1f279cab18974bcba3be7562c798bfbf1fa9f3 /CMakeLists.txt | |
parent | 9b180e530f058806105087b84213d441697784dd (diff) | |
download | wireshark-c00e4697e2003349afdc56cb4d3a853fac63fcbe.tar.gz |
Fix Windows CMake generated installer to include snmp mibs
Wireshark.nsi requires SMI_DIR to point to the base of the SMI directory
but FindSMI.cmake doesn't set it. Set it in the main CMakeLists.txt
Change-Id: Id667341273d6abb0d2d64ef91cc62d1ce3f42a83
Reviewed-on: https://code.wireshark.org/review/9499
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a39ccb8bcd..9611b833e0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1371,6 +1371,8 @@ if(WIN32) ) endif(LUA_FOUND) if (SMI_FOUND) + # Wireshark.nsi wants SMI_DIR which is the base SMI directory + get_filename_component(SMI_DIR ${SMI_DLL_DIR} DIRECTORY) add_custom_command(TARGET copy_cli_dlls PRE_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different "${SMI_DLL_DIR}/${SMI_DLL}" |