CMake: Change installation path for modules

This is one of the CMake standard paths on Unix and avoids polluting the
$libdir/wireshark folder.

Change-Id: I6e5fd81e95b52e585e92306aca18dfb2426668ca
Reviewed-on: https://code.wireshark.org/review/29255
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e620c35dd40b5f08801c7fd98e064f6488e10937..4ee70287d273bfdb224440a8e11f3e7e7a085ebc 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2888,7 +2888,7 @@ install(
        PATTERN "Makefile.*" EXCLUDE
 )
 
-set(CMAKE_INSTALL_MODULES_DIR ${CMAKE_INSTALL_LIBDIR}/${CPACK_PACKAGE_NAME})
+set(CMAKE_INSTALL_MODULES_DIR "${CMAKE_INSTALL_LIBDIR}/${CPACK_PACKAGE_NAME}/cmake")
 configure_file("${CMAKE_MODULE_PATH}/WiresharkConfig.cmake.in" "${CMAKE_BINARY_DIR}/WiresharkConfig.cmake" @ONLY)
 configure_file("${CMAKE_MODULE_PATH}/WiresharkConfigVersion.cmake.in" "${CMAKE_BINARY_DIR}/WiresharkConfigVersion.cmake" @ONLY)
 install(

diff --git a/debian/wireshark-dev.install b/debian/wireshark-dev.install
index 8706f60a19f196e3b0205db5f9e99db5fe0f5170..8701644a037a6e67707ee87af3fa3d28559b2ced 100644 (file)
--- a/debian/wireshark-dev.install
+++ b/debian/wireshark-dev.install
@@ -5,4 +5,4 @@ tools/make-plugin-reg.py usr/share/pyshared
 tools/wireshark_be.py usr/share/pyshared
 tools/wireshark_gen.py usr/share/pyshared
 tools/asn2wrs.py usr/share/pyshared
-usr/lib/*/wireshark/*.cmake
+usr/lib/*/wireshark/cmake/*.cmake