From 0e3912767266473e08386c910954450d16d33664 Mon Sep 17 00:00:00 2001 From: Ben Hilburn Date: Wed, 27 Nov 2013 11:53:38 -0800 Subject: Squashed commit uhd/cleanup. --- host/cmake/Modules/FindUSB1.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'host/cmake/Modules') diff --git a/host/cmake/Modules/FindUSB1.cmake b/host/cmake/Modules/FindUSB1.cmake index a494e1350..b2e4d118c 100644 --- a/host/cmake/Modules/FindUSB1.cmake +++ b/host/cmake/Modules/FindUSB1.cmake @@ -8,7 +8,8 @@ PKG_CHECK_MODULES(PC_LIBUSB QUIET libusb-1.0) FIND_PATH(LIBUSB_INCLUDE_DIRS NAMES libusb.h - HINTS $ENV{LIBUSB_DIR}/include ${PC_LIBUSB_INCLUDEDIR} + HINTS $ENV{LIBUSB_DIR}/include $ENV{LIBUSB_DIR}/include/libusb-1.0 + ${PC_LIBUSB_INCLUDEDIR} ${PC_LIBUSB_INCLUDEDIR}/libusb-1.0 PATHS /usr/local/include/libusb-1.0 /usr/local/include /usr/include/libusb-1.0 /usr/include /opt/local/include/libusb-1.0 -- cgit v1.2.3 From 5b57fe36edb0f4af7030142f4f88eea4728ad1f3 Mon Sep 17 00:00:00 2001 From: Nicholas Corgan Date: Wed, 27 Nov 2013 13:29:18 -0800 Subject: UHDPackage: fix references to README and LICENSE files after name changes --- host/cmake/Modules/UHDPackage.cmake | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'host/cmake/Modules') diff --git a/host/cmake/Modules/UHDPackage.cmake b/host/cmake/Modules/UHDPackage.cmake index 6af474f7a..4968571b5 100644 --- a/host/cmake/Modules/UHDPackage.cmake +++ b/host/cmake/Modules/UHDPackage.cmake @@ -99,9 +99,8 @@ SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Ettus Research - USRP Hardware Driver") SET(CPACK_PACKAGE_VENDOR "Ettus Research LLC") SET(CPACK_PACKAGE_CONTACT "Ettus Research ") SET(CPACK_PACKAGE_VERSION "${UHD_VERSION}") -SET(CPACK_RESOURCE_FILE_WELCOME ${CMAKE_SOURCE_DIR}/README.txt) -SET(CPACK_RESOURCE_FILE_README ${CMAKE_SOURCE_DIR}/AUTHORS.txt) -SET(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/LICENSE.txt) +SET(CPACK_RESOURCE_FILE_WELCOME ${CMAKE_SOURCE_DIR}/../README.md) +SET(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/LICENSE) ######################################################################## # Setup CPack Source -- cgit v1.2.3 From 8ea4820ec0a7e45c61c2a14d9a76ee5d35d59382 Mon Sep 17 00:00:00 2001 From: Nicholas Corgan Date: Wed, 27 Nov 2013 14:20:35 -0800 Subject: cmake: remove Git hash from version string when 'rc' is present --- host/cmake/Modules/UHDVersion.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'host/cmake/Modules') diff --git a/host/cmake/Modules/UHDVersion.cmake b/host/cmake/Modules/UHDVersion.cmake index c07b18f01..fd1b5e7bf 100644 --- a/host/cmake/Modules/UHDVersion.cmake +++ b/host/cmake/Modules/UHDVersion.cmake @@ -27,7 +27,7 @@ FIND_PACKAGE(Git QUIET) ######################################################################## SET(UHD_VERSION_MAJOR 003) SET(UHD_VERSION_MINOR 006) -SET(UHD_VERSION_PATCH 000) +SET(UHD_VERSION_PATCH 001) ######################################################################## # Set up trimmed version numbers for DLL resource files and packages @@ -87,7 +87,7 @@ IF(UHD_RELEASE_MODE) #Ignore UHD_GIT_COUNT in UHD_VERSION if the string 'release' is in UHD_RELEASE_MODE EXECUTE_PROCESS( WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} - COMMAND ${PYTHON_EXECUTABLE} -c "print 'release' in '${UHD_RELEASE_MODE}'" + COMMAND ${PYTHON_EXECUTABLE} -c "print ('release' in '${UHD_RELEASE_MODE}') or ('rc' in '${UHD_RELEASE_MODE}')" OUTPUT_VARIABLE TRIM_UHD_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE ) ENDIF() -- cgit v1.2.3 From 03a1828944aebea34114634f885fdd46471cd211 Mon Sep 17 00:00:00 2001 From: Nicholas Corgan Date: Wed, 4 Dec 2013 07:27:00 -0800 Subject: Updated UHD version and images downloader URL for 3.6.2 release candidate 1 --- host/CMakeLists.txt | 4 ++-- host/cmake/Modules/UHDVersion.cmake | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'host/cmake/Modules') diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt index fcf79bdec..103266edd 100644 --- a/host/CMakeLists.txt +++ b/host/CMakeLists.txt @@ -211,8 +211,8 @@ UHD_INSTALL(FILES # Images download directory for utils/uhd_images_downloader.py ######################################################################## -SET(UHD_IMAGES_MD5SUM "50e68637ae6e08b6e2b3557516bc115b") -SET(UHD_IMAGES_DOWNLOAD_SRC "http://files.ettus.com/binaries/maint_images/archive/uhd-images_003.006.000-release.zip") +SET(UHD_IMAGES_MD5SUM "61db1170aaaadd787f5150b3eceab6f2") +SET(UHD_IMAGES_DOWNLOAD_SRC "http://files.ettus.com/binaries/maint_images/archive/uhd-images_003.006.002-rc1.zip") ######################################################################## # Register top level components diff --git a/host/cmake/Modules/UHDVersion.cmake b/host/cmake/Modules/UHDVersion.cmake index fd1b5e7bf..b0d04fe70 100644 --- a/host/cmake/Modules/UHDVersion.cmake +++ b/host/cmake/Modules/UHDVersion.cmake @@ -27,7 +27,7 @@ FIND_PACKAGE(Git QUIET) ######################################################################## SET(UHD_VERSION_MAJOR 003) SET(UHD_VERSION_MINOR 006) -SET(UHD_VERSION_PATCH 001) +SET(UHD_VERSION_PATCH 002) ######################################################################## # Set up trimmed version numbers for DLL resource files and packages -- cgit v1.2.3