diff options
| -rw-r--r-- | host/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | host/examples/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | host/tests/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | host/usrp_e_utils/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | host/utils/CMakeLists.txt | 8 |
5 files changed, 11 insertions, 8 deletions
diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt index 40d034de5..05dd73d01 100644 --- a/host/CMakeLists.txt +++ b/host/CMakeLists.txt @@ -42,6 +42,9 @@ SET(RUNTIME_DIR bin) SET(LIBRARY_DIR lib${LIB_SUFFIX}) SET(INCLUDE_DIR include) SET(PKG_DATA_DIR share/uhd) +IF(NOT DEFINED PKG_LIB_DIR) + SET(PKG_LIB_DIR ${PKG_DATA_DIR}) +ENDIF() SET(PKG_DOC_DIR share/doc/uhd) ######################################################################## diff --git a/host/examples/CMakeLists.txt b/host/examples/CMakeLists.txt index 4f3650e63..3c9a3880a 100644 --- a/host/examples/CMakeLists.txt +++ b/host/examples/CMakeLists.txt @@ -39,7 +39,7 @@ FOREACH(example_source ${example_sources}) GET_FILENAME_COMPONENT(example_name ${example_source} NAME_WE) ADD_EXECUTABLE(${example_name} ${example_source}) TARGET_LINK_LIBRARIES(${example_name} uhd) - INSTALL(TARGETS ${example_name} RUNTIME DESTINATION ${PKG_DATA_DIR}/examples COMPONENT examples) + INSTALL(TARGETS ${example_name} RUNTIME DESTINATION ${PKG_LIB_DIR}/examples COMPONENT examples) ENDFOREACH(example_source) ######################################################################## @@ -51,5 +51,5 @@ IF(CURSES_FOUND) INCLUDE_DIRECTORIES(${CURSES_INCLUDE_DIR}) ADD_EXECUTABLE(rx_ascii_art_dft rx_ascii_art_dft.cpp) TARGET_LINK_LIBRARIES(rx_ascii_art_dft uhd ${CURSES_LIBRARIES}) - INSTALL(TARGETS rx_ascii_art_dft RUNTIME DESTINATION ${PKG_DATA_DIR}/examples COMPONENT examples) + INSTALL(TARGETS rx_ascii_art_dft RUNTIME DESTINATION ${PKG_LIB_DIR}/examples COMPONENT examples) ENDIF(CURSES_FOUND) diff --git a/host/tests/CMakeLists.txt b/host/tests/CMakeLists.txt index 28cc1c5da..67e99941b 100644 --- a/host/tests/CMakeLists.txt +++ b/host/tests/CMakeLists.txt @@ -45,7 +45,7 @@ FOREACH(test_source ${test_sources}) ADD_EXECUTABLE(${test_name} ${test_source}) TARGET_LINK_LIBRARIES(${test_name} uhd) ADD_TEST(${test_name} ${test_name}) - INSTALL(TARGETS ${test_name} RUNTIME DESTINATION ${PKG_DATA_DIR}/tests COMPONENT tests) + INSTALL(TARGETS ${test_name} RUNTIME DESTINATION ${PKG_LIB_DIR}/tests COMPONENT tests) ENDFOREACH(test_source) ######################################################################## diff --git a/host/usrp_e_utils/CMakeLists.txt b/host/usrp_e_utils/CMakeLists.txt index 2b099cc5d..0d6763174 100644 --- a/host/usrp_e_utils/CMakeLists.txt +++ b/host/usrp_e_utils/CMakeLists.txt @@ -36,7 +36,7 @@ IF(ENABLE_USRP_E_UTILS) GET_FILENAME_COMPONENT(util_name ${util_source} NAME_WE) ADD_EXECUTABLE(${util_name} ${util_source}) TARGET_LINK_LIBRARIES(${util_name} ${Boost_LIBRARIES}) - INSTALL(TARGETS ${util_name} RUNTIME DESTINATION ${PKG_DATA_DIR}/usrp_e_utils) + INSTALL(TARGETS ${util_name} RUNTIME DESTINATION ${PKG_LIB_DIR}/usrp_e_utils) ENDFOREACH(util_source) ENDIF(ENABLE_USRP_E_UTILS) diff --git a/host/utils/CMakeLists.txt b/host/utils/CMakeLists.txt index 430b49c47..9d557f3d2 100644 --- a/host/utils/CMakeLists.txt +++ b/host/utils/CMakeLists.txt @@ -51,7 +51,7 @@ ENDIF(ENABLE_USB) IF(LINUX AND ENABLE_USB) INSTALL(FILES uhd-usrp.rules - DESTINATION ${PKG_DATA_DIR}/utils + DESTINATION ${PKG_LIB_DIR}/utils COMPONENT utilities ) ENDIF(LINUX AND ENABLE_USB) @@ -61,7 +61,7 @@ FOREACH(util_source ${util_share_sources}) GET_FILENAME_COMPONENT(util_name ${util_source} NAME_WE) ADD_EXECUTABLE(${util_name} ${util_source}) TARGET_LINK_LIBRARIES(${util_name} uhd) - INSTALL(TARGETS ${util_name} RUNTIME DESTINATION ${PKG_DATA_DIR}/utils COMPONENT utilities) + INSTALL(TARGETS ${util_name} RUNTIME DESTINATION ${PKG_LIB_DIR}/utils COMPONENT utilities) ENDFOREACH(util_source) IF(ENABLE_USRP2) @@ -72,7 +72,7 @@ IF(ENABLE_USRP2) ) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/dd.exe - DESTINATION ${PKG_DATA_DIR}/utils + DESTINATION ${PKG_LIB_DIR}/utils COMPONENT utilities ) ENDIF(WIN32 AND UHD_RELEASE_MODE) @@ -82,7 +82,7 @@ IF(ENABLE_USRP2) usrp2_card_burner_gui.py usrp_n2xx_net_burner.py usrp_n2xx_net_burner_gui.py - DESTINATION ${PKG_DATA_DIR}/utils + DESTINATION ${PKG_LIB_DIR}/utils COMPONENT utilities ) ENDIF(ENABLE_USRP2) |