diff options
| author | Josh Blum <josh@joshknows.com> | 2011-03-28 13:44:36 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-03-28 13:44:36 -0700 |
| commit | 69d19fedd3fd7945a21daac0ae14c06fee78ee91 (patch) | |
| tree | 995f7959fa0a4047a7bf777dc4275f4e85a98a99 /host | |
| parent | c6c4b01e09efc037aa44dbf8cdba1c705747bd2f (diff) | |
| download | uhd-69d19fedd3fd7945a21daac0ae14c06fee78ee91.tar.gz uhd-69d19fedd3fd7945a21daac0ae14c06fee78ee91.tar.bz2 uhd-69d19fedd3fd7945a21daac0ae14c06fee78ee91.zip | |
uhd: various packing fixes (lib suffix, and library components)
1) setup lib suffix for fedora 64
2) specify component for all library target types (should fix missing library files problem)
Diffstat (limited to 'host')
| -rw-r--r-- | host/Modules/UHDPackage.cmake | 5 | ||||
| -rw-r--r-- | host/lib/CMakeLists.txt | 9 |
2 files changed, 9 insertions, 5 deletions
diff --git a/host/Modules/UHDPackage.cmake b/host/Modules/UHDPackage.cmake index 65637ab16..e7aa386f6 100644 --- a/host/Modules/UHDPackage.cmake +++ b/host/Modules/UHDPackage.cmake @@ -48,6 +48,11 @@ IF(UHD_RELEASE_MODE) SET(CPACK_GENERATOR RPM) ENDIF() + #when the library suffix should be 64 (applies to redhat linux family) + IF(EXISTS "/etc/redhat-release" AND _machine MATCHES "64$") + SET(LIB_SUFFIX 64) + ENDIF() + #set a more sensible package name for this system SET(CPACK_PACKAGE_FILE_NAME "UHD-${UHD_VERSION}-${_os_name}-${_os_version}-${_machine}") diff --git a/host/lib/CMakeLists.txt b/host/lib/CMakeLists.txt index cb75979e8..d095255ea 100644 --- a/host/lib/CMakeLists.txt +++ b/host/lib/CMakeLists.txt @@ -113,14 +113,13 @@ ADD_LIBRARY(uhd SHARED ${libuhd_sources}) TARGET_LINK_LIBRARIES(uhd ${Boost_LIBRARIES} ${libuhd_libs}) SET_TARGET_PROPERTIES(uhd PROPERTIES DEFINE_SYMBOL "UHD_DLL_EXPORTS") SET_TARGET_PROPERTIES(uhd PROPERTIES SOVERSION "${UHD_VERSION_MAJOR}") -SET_TARGET_PROPERTIES(uhd PROPERTIES VERSION "${UHD_VERSION_MAJOR}.${UHD_VERSION_MINOR}") +SET_TARGET_PROPERTIES(uhd PROPERTIES VERSION "${UHD_VERSION}") IF(DEFINED LIBUHD_OUTPUT_NAME) SET_TARGET_PROPERTIES(uhd PROPERTIES OUTPUT_NAME ${LIBUHD_OUTPUT_NAME}) ENDIF(DEFINED LIBUHD_OUTPUT_NAME) INSTALL(TARGETS uhd - LIBRARY DESTINATION ${LIBRARY_DIR} # .so file - ARCHIVE DESTINATION ${LIBRARY_DIR} # .lib file - RUNTIME DESTINATION ${LIBRARY_DIR} # .dll file - COMPONENT libraries + LIBRARY DESTINATION ${LIBRARY_DIR} COMPONENT libraries # .so file + ARCHIVE DESTINATION ${LIBRARY_DIR} COMPONENT libraries # .lib file + RUNTIME DESTINATION ${LIBRARY_DIR} COMPONENT libraries # .dll file ) |