diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2018-11-23 20:39:51 +0000 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2018-11-29 03:19:53 +0000 |
| commit | f4194b128fbf204759602295a1e09d181f91c39f (patch) | |
| tree | b455a319a570b6bae316d1cefc807df25a5cf678 /epan/wslua | |
| parent | a062ab81dd2475437ad875d78308cf5425157d19 (diff) | |
CMake: Change some install() paths to match NSIS package
Currently our Windows code looks for data files in the same
folder as the binary executable (presumably to make the
application relocatable, although it should be possible
to improve this with relative paths?).
Ping-Bug: 15301
Change-Id: I0fef4e87dc9d1d8edef81dd11755761fddd0fd12
Reviewed-on: https://code.wireshark.org/review/30819
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'epan/wslua')
| -rw-r--r-- | epan/wslua/CMakeLists.txt | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/epan/wslua/CMakeLists.txt b/epan/wslua/CMakeLists.txt index 06d46f8d28..cb0495489a 100644 --- a/epan/wslua/CMakeLists.txt +++ b/epan/wslua/CMakeLists.txt @@ -132,13 +132,19 @@ add_custom_target( set_target_properties(wsluaauxiliary PROPERTIES FOLDER "Auxiliary") +if(WIN32) + set(WIRESHARK_INSTALL_LUADIR "${CMAKE_INSTALL_DATADIR}") +else() + set(WIRESHARK_INSTALL_LUADIR "${CMAKE_INSTALL_DATADIR}/${CPACK_PACKAGE_NAME}") +endif() + install( FILES console.lua dtd_gen.lua ${CMAKE_CURRENT_BINARY_DIR}/init.lua DESTINATION - ${CMAKE_INSTALL_DATADIR}/${CPACK_PACKAGE_NAME} + ${WIRESHARK_INSTALL_LUADIR} ) add_library(wslua OBJECT |