Commit graph

11 commits

Author SHA1 Message Date
Rey Tucker
0fcf5f8ed4 host: cmake: add missing quotes in STREQUAL compare
Without this, recent CMake releases can't handle an empty
VERSION_INFO_EXTRA.
2018-03-26 15:32:43 -04:00
Rey Tucker
1a9eb9d371 host: update with fixes from public-facing repo
This includes everything but AGC-related stuff.

Squashed commit of the following:

commit ab00f2a68353024c5faf14dedbb5fd05a8438f26
Author: Rey Tucker <rey.tucker@nuand.com>
Date:   Wed Aug 9 10:58:08 2017 -0400

    libbladeRF: add compilation hint to boilerplate.c

    h/t owen on IRC

commit 3cbeaf72dbe22525a5c907dfb9643db81c7aca85
Author: Rey Tucker <rey.tucker@nuand.com>
Date:   Mon Aug 7 12:27:21 2017 -0400

    host/CMakeLists: dequote variables in ifs (CMP0054) #511

    Per CMake Policy CMP0054, the meaning of constructs like

    if("${FOOBAR}" STREQUAL "quux")

    is ambigious, and the old meaning is deprecated.

    https://cmake.org/cmake/help/git-stage/policy/CMP0054.html

commit 73376b7aac65d945c5399a5130aca33265080653
Author: Rey Tucker <rey.tucker@nuand.com>
Date:   Fri Aug 4 13:40:37 2017 -0400

    host/README.md: add pthreads-win32 build instructions (#447)

    On recent versions of Windows / Visual Studio, struct timespec is
    already defined, and the definition is subtly different than what
    pthreads-win32 is built with.

    It may be possible to handle this in a more automatic fashion via CMake,
    but this is TBD.

commit b90ff648e5cf754a29264f2a2c2c19d924c5c070
Author: Rey Tucker <rey.tucker@nuand.com>
Date:   Mon Aug 7 18:09:30 2017 -0400

    host/cmake/CyAPI: define Windows 10 support

    This requires that the user get special additional drivers in addition
    to the ones provided by the usual SDK; a URL will point in the right
    direction.

    Note that this does not remove the requirement for driver signing.  Some
    work will be needed to document how to do this.

commit 888254b975f3b64ec787c741b937a561a08ccc44
Author: Jon Szymaniak <jon.szymaniak@nuand.com>
Date:   Thu Jun 9 17:47:21 2016 -0400

    libbladeRF: Treat incompatible OS version as "not found" in FindCyAPI.cmake

commit a9e97b2de6c22539266447f755e5a42cdf9a4f70
Author: Rey Tucker <rey.tucker@nuand.com>
Date:   Mon Aug 7 11:35:16 2017 -0400

    host/libbladeRF/cyapi: ReleaseMutex before CloseHandle

    When working on mutexes for the libusb backend, I noticed that I needed
    to ReleaseMutex() when closing the device, or else that device would not
    be usable again until all of the mutexes were released.

    I have not tested this with CyAPI as yet, but I believe the same problem
    will occur, and I also believe this may fix it.

commit b897475aa1a5b80358fcf2c8902089740d04582f
Author: Rey Tucker <rey.tucker@nuand.com>
Date:   Fri Aug 4 18:00:34 2017 -0400

    host/libusb.c: properly release/close handles

commit f9b99ee7715af1ccb64d41d3363a3cc8e66aa063
Author: Rey Tucker <rey.tucker@nuand.com>
Date:   Fri Aug 4 17:17:29 2017 -0400

    host/libusb.c: fix create_device_mutex errors (#484)

    This builds and correctly enforces exclusive access under Windows 10.

commit 6e9c048ff2e8321052c3e72e14f51eb2aa66b5dc
Author: Rey Tucker <rey.tucker@nuand.com>
Date:   Thu Aug 3 13:14:51 2017 -0400

    host/backend/libusb: enforce exclusive access (#484)

    Windows seems to allow multiple instances of libbladeRF to open the same
    device, which is problematic in many ways.  This borrows the mutex
    approach from cyapi.c to enforce exclusivity.

commit 519f26b6b88d1cbdfec7138fe9a0fc13715c7f93
Author: Rey Tucker <rey.tucker@nuand.com>
Date:   Fri Aug 4 16:07:49 2017 -0400

    host/cmake: search for pthreadVC2.dll more vigorously (#517)

    With the pre-built binary pack, pthreadVC2.dll lives in a
    dll/${ARCHITECTURE}/ directory.  However, when compiling from scratch,
    it just lives in the source code's root directory.  Look in both places
    and set a LIBPTHREADSWIN32_DLL variable accordingly.

commit b7617cda8e87396da19101f10de02619d0fd8e1d
Author: Rey Tucker <rey.tucker@nuand.com>
Date:   Wed Aug 2 18:05:33 2017 -0400

    CONTRIBUTORS: self-updating

commit 3a4e57b3c2f2b9ac27db832de0bbc945c3217dd7
Author: Rey Tucker <rey.tucker@nuand.com>
Date:   Tue Jul 25 15:07:54 2017 -0400

    debian: chmod 0444 downloaded fpga/fw images

    The mktemp/wget workflow creates the data files chmod 0600, which breaks
    loading of firmware for non-root users.  Explicitly chmod 0444 to allow
    all users to read.

commit 24594d3e34eca05c2fc738dc2fa5d1fcc9ab0bda
Author: Rey Tucker <rey.tucker@nuand.com>
Date:   Wed Aug 2 17:34:11 2017 -0400

    host: add note about Fedora and /usr/local (#490)

commit 6219e15a38c8dfe957e12ce38fbd76e0bf40a177
Author: Rey Tucker <rey.tucker@nuand.com>
Date:   Wed Aug 2 15:35:27 2017 -0400

    nios: fix si5338_write typo (#491)

    Unnecessary bit is being set when writing address.

commit 0d14e6ec0a3d438c206f4d02a95aa4b250ec3674
Author: Oliver Jowett <oliver@mutability.co.uk>
Date:   Thu Apr 27 21:03:12 2017 +0100

    Document why postinst should succeed if the FPGA download fails

commit 84042b6aa5bcc761c631a06687dc690343f4d952
Author: Oliver Jowett <oliver@mutability.co.uk>
Date:   Thu Apr 27 13:20:25 2017 +0100

    Don't make postinst fail entirely (producing half-configured packages and
    making the overall install operation fail) if the FPGA download fails.

    (cherry picked from commit 13befc071b3cddb913ce961c3cd7b08216bba2e5)

commit b203fbca8c789d8a99bbef34e20feda9d1a6e940
Author: ifrasch <fraschi17@gmail.com>
Date:   Sat Feb 18 17:28:59 2017 -0500

    hdl: Fixed simulation files

    -Added missing ports to nios_system.vhd
    -Added missing files to nuand.do
    -Compile.do will now compile successfully in Modelsim
2017-12-21 12:55:07 -05:00
Rey Tucker
a7b2445d87 host/cmake: fix regression from #511
We explicitly set VERSION_INFO_EXTRA to "" for release builds, which
causes (${VERSION_INFO_EXTRA} STREQUAL "") to evaluate to
( STREQUAL ""), a syntax error.

Quoting ${VERSION_INFO_EXTRA} should not cause the ambigious condition
foretold in CMP0054, so doing that.
2017-10-24 16:15:22 -04:00
Rey Tucker
a075d0149b host/CMakeLists: dequote variables in ifs (CMP0054) #511
Per CMake Policy CMP0054, the meaning of constructs like

if("${FOOBAR}" STREQUAL "quux")

is ambigious, and the old meaning is deprecated.

https://cmake.org/cmake/help/git-stage/policy/CMP0054.html
2017-08-07 12:27:21 -04:00
Ryan Tucker
98eca856f9 Inject the current Debian snapshot version
This figures out the version number of the source package we're
building, then injects it into the VERSION_INFO within CMake.
2013-10-27 15:51:32 -04:00
Jon Szymaniak
3891711766 cmake: Cleaned up git version info
If rev and dirty flag are not set properly, the version won't wind up
with a dangling '-' character.
2013-10-21 23:01:44 -04:00
Jon Szymaniak
6343982cd6 cmake: Copyright/attibution cleanup
Most of these files had inaccurate copy-paste headers, as the files are
now vastly different than those mentioned. These will all just fall under
the "meta-data" category in upcoming licenses.

Per discussion with FindLibBladeRF.cmake author, the text in
FindLibTecla.cmake was unnecessary, and has been removed.
2013-10-21 21:00:15 -04:00
Robert Ghilduta
00ba848e6b Cmake: fix error that caused all build versions to be labelled -dirty 2013-09-14 23:31:49 -07:00
Jon
b23b540cc1 Update Version.cmake
Fixed warning message when git is not available.
2013-08-31 15:45:55 -04:00
Jon Szymaniak
e303076921 First cut at functioning CMake setup (Linux-only)
Further revisions will be needed to do some cleanup, as well as
address Windows & OSX support.
2013-08-13 01:24:58 -04:00
Jon Szymaniak
6323d15990 libbladeRF & CLI: [WIP] In the process of switching over to CMake
*Warning:* This is a broken nightly commit.

If not obvious, quite a bit of rearranging has been done.

The build script(s) for libbladeRF is mostly complete. This still
requires further configuration of debug builds and version info being
used to populate a version header.

Some cleanup has been done in the (formerly apps, now) utilities
directory. There's no CMake support in here yet...that's comming in the
next commit.
2013-08-12 03:24:16 -04:00