diff options
| author | Balint Reczey <balint@balintreczey.hu> | 2014-05-29 10:58:05 +0700 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2014-05-30 13:36:02 +0000 |
| commit | 5c6403b27bdcc0e0aac065b2daf9a2625292610f (patch) | |
| tree | a494e248411a9099cd0d09ad8191307d7954cc10 | |
| parent | 75531b6a40719c9cac603f699f0cdf72159fd518 (diff) | |
Honor configured CMAKE_INSTALL_LIBDIR when installing libraries
Change-Id: I860c9408ed01e9567992b0dcf5c6c6421344c13e
Reviewed-on: https://code.wireshark.org/review/1862
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
| -rw-r--r-- | epan/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | filetap/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | wiretap/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | wsutil/CMakeLists.txt | 6 |
4 files changed, 12 insertions, 12 deletions
diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt index b783831c40..f68aa24033 100644 --- a/epan/CMakeLists.txt +++ b/epan/CMakeLists.txt @@ -1724,9 +1724,9 @@ add_dependencies(epan lemon) if(NOT ${ENABLE_STATIC}) install(TARGETS epan - LIBRARY DESTINATION lib - RUNTIME DESTINATION lib - ARCHIVE DESTINATION lib + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ) endif() diff --git a/filetap/CMakeLists.txt b/filetap/CMakeLists.txt index 82001b0eaa..f78bc7df4e 100644 --- a/filetap/CMakeLists.txt +++ b/filetap/CMakeLists.txt @@ -75,9 +75,9 @@ target_link_libraries(filetap ${filetap_LIBS}) if(NOT ${ENABLE_STATIC}) install(TARGETS filetap - LIBRARY DESTINATION lib - RUNTIME DESTINATION lib - ARCHIVE DESTINATION lib + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ) endif() diff --git a/wiretap/CMakeLists.txt b/wiretap/CMakeLists.txt index 37432cbeb5..38010ed721 100644 --- a/wiretap/CMakeLists.txt +++ b/wiretap/CMakeLists.txt @@ -134,9 +134,9 @@ target_link_libraries(wiretap ${wiretap_LIBS}) if(NOT ${ENABLE_STATIC}) install(TARGETS wiretap - LIBRARY DESTINATION lib - RUNTIME DESTINATION lib - ARCHIVE DESTINATION lib + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ) endif() diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt index 44525a8176..b7e8dc4913 100644 --- a/wsutil/CMakeLists.txt +++ b/wsutil/CMakeLists.txt @@ -117,9 +117,9 @@ target_link_libraries(wsutil ${wsutil_LIBS}) if(NOT ${ENABLE_STATIC}) install(TARGETS wsutil - LIBRARY DESTINATION lib - RUNTIME DESTINATION lib - ARCHIVE DESTINATION lib + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ) endif() |