DISPATCH-194 - Remove .so versioning and add an executable RPATH to locate the library
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/f5a48173 Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/f5a48173 Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/f5a48173 Branch: refs/heads/master Commit: f5a48173acfdaf4576ad4cab599222fc5dbcd63b Parents: 6c56ba5 Author: Ted Ross <[email protected]> Authored: Wed May 4 15:45:09 2016 -0400 Committer: Ted Ross <[email protected]> Committed: Wed May 4 15:45:09 2016 -0400 ---------------------------------------------------------------------- router/CMakeLists.txt | 2 ++ src/CMakeLists.txt | 4 +--- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/f5a48173/router/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/router/CMakeLists.txt b/router/CMakeLists.txt index 5dcf3c3..5681e00 100644 --- a/router/CMakeLists.txt +++ b/router/CMakeLists.txt @@ -32,6 +32,8 @@ set(router_SOURCES src/main.c ) +SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${QPID_DISPATCH_HOME}") + add_executable(qdrouterd ${router_SOURCES}) target_link_libraries(qdrouterd qpid-dispatch ${proton_lib}) http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/f5a48173/src/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index cbfae10..4d7f784 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -101,14 +101,12 @@ set_property( add_library(qpid-dispatch SHARED ${qpid_dispatch_SOURCES}) target_link_libraries(qpid-dispatch ${Proton_LIBRARIES} ${pthread_lib} ${rt_lib} ${dl_lib} ${PYTHON_LIBRARIES}) set_target_properties(qpid-dispatch PROPERTIES - VERSION "${SO_VERSION}" - SOVERSION "${SO_VERSION_MAJOR}" LINK_FLAGS "${CATCH_UNDEFINED}" ) install(TARGETS qpid-dispatch LIBRARY DESTINATION ${QPID_DISPATCH_HOME}) # Set in parent scope for calling cmake file. -set (QPID_DISPATCH_LIB "libqpid-dispatch.so.${SO_VERSION_MAJOR}" PARENT_SCOPE) +set (QPID_DISPATCH_LIB "libqpid-dispatch.so" PARENT_SCOPE) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
