diff options
| author | Balint Reczey <balint@balintreczey.hu> | 2015-04-10 01:58:42 +0200 |
|---|---|---|
| committer | Balint Reczey <balint@balintreczey.hu> | 2015-04-16 10:21:48 +0000 |
| commit | 2d79f56df1bb779cf5628359c778adbc98dfbf6a (patch) | |
| tree | ff207f01c6a94b6a3873ad5670287bd4df054d80 | |
| parent | ec83c79c74440cac6a625da44f8ad6a67fe9805d (diff) | |
Fix wireshark.pc when CMAKE_INSTALL_LIBDIR is absolute
Change-Id: I9667660329c0888f35e1ac332537eda995509a85
Reviewed-on: https://code.wireshark.org/review/8010
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
| -rw-r--r-- | CMakeLists.txt | 11 | ||||
| -rw-r--r-- | wireshark.pc.in | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 16b1de9975..39a2783779 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -938,17 +938,18 @@ if(ENABLE_EXTCAP) set(EXTCAP_DIR "${DATAFILE_DIR}/extcap/") endif() +if(IS_ABSOLUTE ${CMAKE_INSTALL_LIBDIR}) + set(ABSOLUTE_CMAKE_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}") +else() + set(ABSOLUTE_CMAKE_INSTALL_LIBDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") +endif() # Location of our plugins. PLUGIN_DIRECTORY should allow running # from the build directory similar to DATAFILE_DIR above. if(ENABLE_PLUGINS) set(HAVE_PLUGINS 1) add_custom_target(plugins) set_target_properties(plugins PROPERTIES FOLDER "Plugins") - if(IS_ABSOLUTE ${CMAKE_INSTALL_LIBDIR}) - set(PLUGIN_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/@CPACK_PACKAGE_NAME@/plugins/${CPACK_PACKAGE_VERSION}") - else() - set(PLUGIN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/@CPACK_PACKAGE_NAME@/plugins/${CPACK_PACKAGE_VERSION}") - endif() + set(PLUGIN_INSTALL_DIR "${ABSOLUTE_CMAKE_INSTALL_LIBDIR}/@CPACK_PACKAGE_NAME@/plugins/${CPACK_PACKAGE_VERSION}") set(PLUGIN_SRC_DIRS plugins/docsis plugins/ethercat diff --git a/wireshark.pc.in b/wireshark.pc.in index 91bf28b77a..826b230577 100644 --- a/wireshark.pc.in +++ b/wireshark.pc.in @@ -1,6 +1,6 @@ prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=${prefix} -libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ +libdir=@ABSOLUTE_CMAKE_INSTALL_LIBDIR@ sharedlibdir=${libdir} includedir=${prefix}/include/wireshark plugindir=@PLUGIN_INSTALL_DIR@ |