diff options
| author | Ben Hilburn <ben.hilburn@ettus.com> | 2015-01-27 16:07:43 -0800 |
|---|---|---|
| committer | Ben Hilburn <ben.hilburn@ettus.com> | 2015-01-27 16:07:43 -0800 |
| commit | 75d519706b9b0956307a6a4bdc53c36376f19f03 (patch) | |
| tree | b2d2144c31c3ea04167ef7e3d1b14f7477c158cf /host/CMakeLists.txt | |
| parent | 8d0d0d01c0a2a5ed1a01da4360226a64ab8117bc (diff) | |
| download | uhd-75d519706b9b0956307a6a4bdc53c36376f19f03.tar.gz uhd-75d519706b9b0956307a6a4bdc53c36376f19f03.tar.bz2 uhd-75d519706b9b0956307a6a4bdc53c36376f19f03.zip | |
Merging new UHD_IMAGES_DIR utilities and bug fixes.
Also includes NI-USRP Windows Registry Key fixes.
Diffstat (limited to 'host/CMakeLists.txt')
| -rw-r--r-- | host/CMakeLists.txt | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt index c90c5de14..4a6c171f5 100644 --- a/host/CMakeLists.txt +++ b/host/CMakeLists.txt @@ -60,6 +60,26 @@ SET(PKG_DOC_DIR share/doc/uhd) SET(PKG_MAN_DIR share/man/man1) ######################################################################## +# UHD Image Directories +######################################################################## +IF(NOT DEFINED UHD_IMAGES_DIR) + IF(DEFINED FPGA_IMAGES_DIR) + SET(UHD_IMAGES_DIR ${FPGA_IMAGES_DIR}) + ELSE(DEFINED FPGA_IMAGES_DIR) + FILE(TO_NATIVE_PATH ${CMAKE_INSTALL_PREFIX}/share/uhd/images using_images_dir) + SET(UHD_IMAGES_DIR ${using_images_dir}) + ENDIF(DEFINED FPGA_IMAGES_DIR) +ENDIF(NOT DEFINED UHD_IMAGES_DIR) + +OPTION(UHD_IMAGES_DIR "Path to installed UHD image binaries.") +MESSAGE( STATUS "Using UHD Images Directory: ${UHD_IMAGES_DIR}" ) +ADD_DEFINITIONS(-DUHD_IMAGES_DIR=${UHD_IMAGES_DIR}) + +IF(DEFINED USE_NIUSRP_WINREG_KEY) + ADD_DEFINITIONS(-DUSE_NIUSRP_WINREG_KEY) +ENDIF(DEFINED USE_NIUSRP_WINREG_KEY) + +######################################################################## # Local Include Dir ######################################################################## INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/include) @@ -362,7 +382,7 @@ UHD_INSTALL( ) ######################################################################## -# Handle pre-built images +# Handle pre-built UHD Images meant for installation ######################################################################## IF(DEFINED UHD_IMAGES_DIR AND EXISTS "${UHD_IMAGES_DIR}") FILE(GLOB_RECURSE _image_files "${UHD_IMAGES_DIR}/*") |