From fd2777b13887a785bd2ce722b4795aab50752afa Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Fri, 11 Aug 2017 01:01:58 +0000 Subject: CMake: Make PLUGIN_INSTALL_DIR absolute. CMAKE_INSTALL_LIBDIR is a relative path. Prefix it with CMAKE_INSTALL_PREFIX so that PLUGIN_INSTALL_DIR is absolute. This matches our Autotools behavior. Change-Id: Ib42cea8745615686e0c7e8473bdb1975a3b9eccd Reviewed-on: https://code.wireshark.org/review/23043 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f4c27ebcac..e57559e8d6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1349,7 +1349,7 @@ endif() if (WIN32) set(PLUGIN_INSTALL_DIR "plugins/${CPACK_PACKAGE_VERSION}") else () - set(PLUGIN_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/${CPACK_PACKAGE_NAME}/plugins/${CPACK_PACKAGE_VERSION}") + set(PLUGIN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/${CPACK_PACKAGE_NAME}/plugins/${CPACK_PACKAGE_VERSION}") endif() # Location of our plugins. PLUGIN_DIR should allow running -- cgit v1.2.3