diff options
author | Gerald Combs <gerald@wireshark.org> | 2017-08-11 01:01:58 +0000 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2017-08-11 15:05:33 +0000 |
commit | fd2777b13887a785bd2ce722b4795aab50752afa (patch) | |
tree | 3d11c79dce5be63ce64bc06042aa51ce11a52f99 | |
parent | 5a0aa773c1e5f1102c1a0124554794672eaca931 (diff) |
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 <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
-rw-r--r-- | CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
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 |