Commit graph

106 commits

Author SHA1 Message Date
Martin Braun
90fd966e25 Merge branch 'maint' 2014-08-18 13:38:04 +02:00
Nicholas Corgan
7297ebffc3 cmake: fixed FindORC logic, was allowing usage of versions below minimum 2014-08-14 07:05:16 -07:00
Nicholas Corgan
e3826b1a67 Restoring compatibility with CMake 2.6
* The UNSET command didn't exist back then, but using SET with no value does the same thing
* CMake 2.6 doesn't like nested parantheses in IF statements, so tweak IF/ELSE statements
2014-08-14 06:45:53 -07:00
Martin Braun
28bc48ee49 Merge branch 'maint' 2014-08-07 17:26:03 +02:00
Nicholas Corgan
781d7a24ab cmake: add UHD version to NSIS installer title 2014-08-05 10:29:16 -07:00
Nicholas Corgan
7423d1691f Merge branch 'maint' 2014-07-23 07:16:22 -07:00
Nicholas Corgan
6ca920485a Updated UHD version and images URL+MD5sum for 3.7.2 rc1 2014-07-23 07:11:59 -07:00
Nicholas Corgan
383061d8e6 Merge branch 'maint' 2014-06-03 10:09:12 -07:00
Nicholas Corgan
bae76224e3 cmake: added "libusb-1.0" to the list of library names for libusb 2014-06-03 09:31:00 -07:00
Ben Hilburn
2f0b3fd72b Merging maint. Includes manual changes which break B200 Doxygen page 2014-05-14 13:05:45 -07:00
Nicholas Corgan
a067783cf7 cmake: add option to specify MSVC version in package filename 2014-05-07 11:47:55 -07:00
Nicholas Corgan
717fd5564d Merge branch 'maint' 2014-04-30 14:06:59 -07:00
Nicholas Corgan
63edfdf430 cmake: fix UHD_VERSION determination when most recent tag contains hyphens 2014-04-30 12:39:50 -07:00
Nicholas Corgan
b0267efa30 Merge branch 'maint' 2014-04-21 14:37:25 -07:00
Nicholas Corgan
743aca4c3e Updated UHD version to 3.7.1, changed images information accordingly 2014-04-21 14:36:38 -07:00
Nicholas Corgan
db19fcbba8 readme fix 2014-04-21 12:24:27 -07:00
Nicholas Corgan
b161d18b69 NSIS: update Start Menu documentation links after Doxygen+Manual consolidation 2014-04-09 17:25:09 +02:00
Nicholas Corgan
e1c329059d cmake: don't set CPACK_SET_DESTDIR with NSIS 2014-03-21 09:58:21 -07:00
Nicholas Corgan
43a2a82e84 cmake: added CPACK_SET_DESTDIR variable for consistent CMAKE_INSTALL_PREFIX usage in packaging 2014-03-17 09:29:26 -07:00
Ben Hilburn
178ac3f1c9 Merging USRP X300 and X310 support!! 2014-02-04 11:04:07 -08:00
Nicholas Corgan
5549a2b46a UHDPackage: with a libusbx static library being used for installers, remove libusb-1.0 as package dependency 2013-12-20 12:18:54 -08:00
Ben Hilburn
8417bddb05 Merge remote-tracking branch 'origin/mergeme/win7_start_menu_docs' 2013-12-11 19:06:36 -08:00
Ben Hilburn
4d7c800b73 Merging Philip Balister's work for ARM cross-compilation. 2013-12-11 18:10:06 -08:00
Nicholas Corgan
03a1828944 Updated UHD version and images downloader URL for 3.6.2 release candidate 1 2013-12-04 07:27:00 -08:00
Nicholas Corgan
8ea4820ec0 cmake: remove Git hash from version string when 'rc' is present 2013-11-27 14:20:35 -08:00
Nicholas Corgan
5b57fe36ed UHDPackage: fix references to README and LICENSE files after name changes 2013-11-27 13:29:18 -08:00
Ben Hilburn
0e39127672 Squashed commit uhd/cleanup. 2013-11-27 11:53:38 -08:00
Nicholas Corgan
02734bb1f0 Updated UHD version to 3.6.0 2013-11-19 16:26:25 -08:00
Nicholas Corgan
0ae04b96df Merge branch 'maint'
Conflicts:
	host/CMakeLists.txt
2013-11-19 15:56:02 -08:00
Nicholas Corgan
3c6a906c59 Updated UHD version to 3.5.5 2013-11-19 12:40:48 -08:00
Nicholas Corgan
cae94a2b4e For Windows users, Doxygen and Manual documentation are available from Start Menu 2013-09-27 09:39:19 -07:00
Nicholas Corgan
8521c39275 Merge branch 'maint'
Conflicts:
	host/CMakeLists.txt
2013-09-25 08:03:58 -07:00
Nicholas Corgan
a219f16c3d Updated UHD version to 3.5.4 2013-09-25 08:02:20 -07:00
Josh Blum
feabc1c7bb Merge branch 'maint' 2013-09-11 11:10:04 -07:00
Nicholas Corgan
c2c9388306 Fixed references to Linux USB permissions commands
* 'sudo udevadm trigger' needs to be run after reloading rules
2013-09-11 09:23:41 -07:00
Josh Blum
f6dd15477d usb: useful error messages on failed submit 2013-07-16 12:30:04 -07:00
Nicholas Corgan
6cfe82e7b6 Merge branch 'maint' 2013-06-20 14:12:15 -07:00
Nicholas Corgan
deef51d8a3 MSVC automatically installs MSVC runtime DLL's 2013-06-20 14:05:13 -07:00
Nicholas Corgan
49a4929bd3 Merge branch 'maint' 2013-05-17 11:10:46 -07:00
Nicholas Corgan
e40ac38dbf cmake: Copied CMakeParseArguments for backwards compatibility 2013-05-17 11:10:42 -07:00
Nicholas Corgan
6524f46bc5 Merge branch 'maint'
Conflicts:
	host/tests/CMakeLists.txt
2013-05-10 15:07:03 -07:00
Nicholas Corgan
4b72513a89 Added CMake variables to customize builds to match Debian package configurations
* -DLIBUHD_PKG=ON installs with libuhd003 configuration
* -DLIBUHDDEV_PKG=ON installs with libuhd-dev configuration
* -DUHDHOST_PKG=ON installs with uhd-host configuration
2013-05-10 15:04:00 -07:00
Nicholas Corgan
df8faaad21 Merge branch 'maint' 2013-05-10 09:53:15 -07:00
Nicholas Corgan
f4c58120dc Bumped up version to 3.5.3 2013-05-10 09:53:02 -07:00
Nicholas Corgan
265daa5867 Merge branch 'maint' 2013-05-03 10:59:42 -07:00
Nicholas Corgan
b0a4e2ad08 UHD has man pages now
* Linux installations will automatically install man pages
* Moved usrp_n2xx_simple_net_burner and usrp2_card_burner into bin
2013-05-03 10:59:37 -07:00
Nicholas Corgan
0862415358 Merge branch 'maint' 2013-04-30 10:41:37 -07:00
Nicholas Corgan
b8bdbc5131 Minor changes for Debian package compliance
* Made CMake script to find libusb-1.0 stronger
* Added Debian watchfile
2013-04-30 10:41:25 -07:00
Nicholas Corgan
cdb261b45b cmake: Added custom NSIS templates
* More personalized messages
* Unused "UHD Desktop Icon" option removed
* UHD Images Downloader, USRP2 Card Burner, and USRP-N2XX Net Burner added to Start Menu
2013-04-16 11:07:49 -07:00
Josh Blum
3405201567 orc: fixed orc version check with pkg config 2013-04-15 10:02:26 -07:00