Commit graph

37 commits

Author SHA1 Message Date
Jon Szymaniak
f74c8ee071 host: Updated CMake files for different CyUSB3 INF paths 2016-01-03 21:26:50 -05:00
Nick "Darkfiber" Wolff
327dce57b1 host: Minimal build fixes for FreeBSD
Work still needs to be done to troubleshoot libusb issues.
2015-12-14 11:36:15 -05:00
Jon Szymaniak
8a867db62b host: Fixed copy of WdfCoInstaller from FX3 SDK to build dir
Cypress FX3 SDK 1.3.x ships version 01009 for <= Vista and
01011 for >= Win 7.
2015-10-08 13:32:22 -04:00
Jon Szymaniak
28b1d281de host: Copy licenses alongside their associated DLLs/drivers 2014-10-31 10:50:32 -04:00
Jon Szymaniak
4fe977c7f8 cmake: Copy CYUSB3 driver based upon host processor, not build config
A 64-bit CYUSB3 driver should be installed on 64-bit machines, regardless of the
userspace software being configured for a 32-bit build.
2014-10-28 06:43:43 -04:00
Jon Szymaniak
90741dbd94 cmake: Set Windows-specific LIBUSB_PATH default only for WIN32 systems 2014-10-27 11:52:58 -04:00
Jon Szymaniak
97a44f94e4 cmake: Explicitly link libusb at runtime for version check in Windows
FindLibUSB.cmake presents issues with its try_compile() invocation
when using some dated CMake versions, such as 2.8.7 and 2.8.11, while
operating fine with more recent versions (e.g., 2.8.12.2, 3.0.0).

Using try_run() is a cleaner solution than a combination of try_compile() and
execute_process(). However, in Windows we need to stage libusb-1.0.dll in the
directory containing the resulting libusb_version.exe. As try_run() creates a
a temporary build directory and deletes it when done, this originally
posed a challenge to copying libusb-1.0.dll to the correct directory.

To address both of these challenges, the Windows version of this program now
explicitly links libusb at runtime, provided the path to the libusb DLL.

OSX and Linux variants assume libusb is in the library path, and link against
the library at compile-time.
2014-10-22 02:54:15 -04:00
Jon Szymaniak
34151f6e71 host: Added a config-time libusb version check and errors/warnings
FindLibUSB.cmake now fetches the libusb version via libusb_get_version()
so that we can warn (or error out) about the system containing an
outdated libusb version.

The following policies have been based upon support experiences and the
libusb changelog:

    Windows: Error out for libusb < 1.0.19
        v1.0.19 provides Windows 8 SuperSpeed detection support,
        and appears to address a number of issues bladeRF users
        have reported with v1.0.18 and earlier.

        We force users to update here, given that some of the failures
        on earlier versions were yielding corrupted samples.

    OSX: Warn for libusb < 1.0.18:
        v1.0.16 - v1.0.18 introduced SuperSpeed and 64-bit support,
        as well as fixes for compile-time and run-time issues.

    Linux: Warn for libusb < 1.0.16:
        This is largely based upon feedback from bladeRF users. While
        older versions may work, a number of users reported that issues
        appeared to be resolved after updating libusb to >= 1.0.16.
        (It isn't always clear if the reported update included Linux
         distro upgrades that included kernel updates.)

The version check may be skipped via LIBUSB_SKIP_VERSION_CHECK=Yes.
This is intentionally not noted in the warnings/errors, as it's
preferred that users update libusb rather than just skip the check.
2014-10-15 20:06:53 -04:00
Jon Szymaniak
7767c9756a cmake: Set FX3 SDK path variable's default value from environment variable
The FX3 SDK installer creates the FX3_INSTALL_PATH variable, so there's
no need to hardcode a default path.
2014-10-13 09:55:31 -04:00
Jon Szymaniak
0b7f43712c libbladeRF: Added support for Cypress Windows Driver & API backend
A USB backend based atop of the Cypress CyAPI (which is based atop the
Cypress CyUSB3 driver) has been introduced. This is intended to provide
Windows users with an additional driver to use if they encounter issues
with their USB host controller and libusb.

To build and use this backend, the Cypress FX3 SDK must be installed and
the following CMake flags should be provided:
    -DENABLE_BACKEND_CYAPI=Yes -DFX3_SDK_PATH=<path to SDK>

A modified cyusb3.inf is provided in host/drivers/windows/cyusb3. Upon
performing a build this inf file and the associated driver files from
the FX3 SDK will be copied into the "output" directory along with the
bladeRF.dll and bladeRF-cli.exe. To install the driver, point the
Windows driver update to this location and accept the warning about the
driver being unsigned; this occurs because the Cypress driver wasn't
signed with bladeRF VID/PID values.

The libbladeRF device string for this backend is: "cypress"

Many thanks go out to LazyDodo for all his efforts in spearheading the
development of this backend -- much of this code is either his doing or
is directly based upon his efforts.
2014-10-12 21:55:26 -04:00
Jon Szymaniak
7c0969a44d host: Enable short source file name and line # in log output by default
When making log_* calls, add these two lines to the corresponding
CMake file prior to add_library() or add_executable():

    set(SRC_TO_SHORTEN ${MY_SRC_LIST})
    include(ShortFileMacro)

Many thanks to LazyDodo for providing the CMake approach for doing this,
and to rwr for suggesting this change.
2014-10-02 12:29:14 -04:00
Jon Szymaniak
a8d6065e61 cmake: Fixed if()/endif() mismatch
This was mistake was introduced in 62a0ab5e.
2014-10-02 11:47:33 -04:00
Jon Szymaniak
62a0ab5ee8 cmake: Skip libc & libusb version checks when cross-compiling
These checks break cross-compilation, as they require code to be
run on the host machine.
2014-10-01 02:44:49 -04:00
Jon Szymaniak
f607510500 cmake: Defaulted Windows LIBUSB_PATH to libusb-1.0.19 2014-07-22 23:26:58 -04:00
Jon Szymaniak
9c651b5996 cmake: Fixed default for LIBUSB_PATH (Windows) 2014-07-05 14:56:29 -04:00
Jon Szymaniak
2a90a56d55 host: Added additional configuration-time libusb function checks
Added checks for the following functions so that builds on older setups
will error out with error messages at configuration time, rather than
compilation errors at build time.
    - libusb_error_name()
    - libusb_get_device_speed()
    - libusb_handle_events_timeout()
    - libusb_handle_events_timeout_completed()
2014-05-13 00:09:53 -04:00
Jon Szymaniak
288258d58e host: Fixed FindLibUSB.cmake issues on OSX Mavericks, cmake touch-ups
Fixed Issue #242, where the FindLibUSB.cmake script wasn't finding a
libusb installed to /usr/local/ in the case where pkg-config wasn't
installed. This should also help in cases where pkg-config isn't
installed on Linux systems.

Other touch-ups include removal of an unnecessary warning message,
and some re-arrangement of operations.
2014-05-06 23:45:01 -04:00
Jon Szymaniak
95a6c1d0e0 cmake: Fixes and cleanup for libusb detection and version checks
The version checks are now enforced. (Fixes #130)

FindLibUsb now warns if the user is using < libusb-1.0.16, as this or
1.0.17 are *highly* recommended.

The redundant version check in Windows (ver.c) has been removed. Testing
with CMake 2.8.11.2 has shown check_library_exists() to be sufficient.
2013-12-09 23:53:38 -05: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
Ryan Tucker
edc468dbb2 Update debian/copyright to match current state
Second/third/fourth pairs of eyes are welcome...

h/t to A. Maitland Bottoms' Debian package for spotting the
Altera and OpenCores packages
2013-10-27 00:18:13 -04:00
Jon Szymaniak
625694eaa5 license: License changes on various portions of the codebase
Where possible (and with contributor permission), items have been
changed to LGPLv2.1 or MIT licenses to avoid issues with any proprietary
libraries from vendors (HDL and FW), allow static linking (with headless
mode operation in mind), and to generally present users with more
permissive licenses.

File headers and the COPYING have been updated accordingly. Third party
sources have been either removed, replaced, or relocated in the source
tree, in accordance with the licenses decided upon for each part of the tree.

Contributor Assignment Agreements have been added, and it is required
that these be submitted before significant patches and pull requests
are accepted.
2013-10-27 00:17:35 -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
Ryan Tucker
c27a67fa63 Warn the user if pkg-config isn't installed
Helpfully suggest installing pkg-config if FindLibUSB.cmake fails.
This change should not impact the build mechanics.
2013-10-05 20:53:43 -04:00
Jon Szymaniak
553985478b cmake: Added check for libusb_get_version (github edit)
This function is used by libbladeRF. This check effectively ensures the library is >= 1.0.10.
2013-09-19 10:03:35 -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
Robert Ghilduta
03ef44b21e copy Windows DLLs into the bladeRF-cli.exe build directory 2013-09-02 12:14:03 -07:00
Jon Szymaniak
b30446293e Added pthreads-win32, and getopt/getopt_long to Windows build. 2013-09-03 00:19:39 -04:00
Jon Szymaniak
056c296b90 Fixed linking issue for Win64 hosts.
CMake's WIN32 is true for both 32 and 64-bit hosts, so we must
instead use CMAKE_CL_64 or CMAKE_SIZEOF_VOID_P.
2013-09-02 23:22:58 -04:00
Jon Szymaniak
e1f4dcd3de bladeRF-cli: ENABLE_INTERACTIVE_TECLA set to OFF if libtecla is not found 2013-08-31 21:14:06 -04:00
Jon
b23b540cc1 Update Version.cmake
Fixed warning message when git is not available.
2013-08-31 15:45:55 -04:00
Jon Szymaniak
d394f68084 host: Fixed build items broken by Windows build-related commits.
This includes freqmod's fixes provided in pull request/issue #57,
in addition to some other misc. cleanup items noted while reviewing
the aforementioned changset.
2013-08-25 11:16:07 -04:00
Jon Szymaniak
33365c196c host: Fixed a few minor CMake issues for Windows builds 2013-08-25 00:09:15 -04:00
Jon Szymaniak
98723ef149 host: Cleand up FindLibUSB.cmake to only search for libusb(x)-1.0
This file will likely need more test driving in Windows and OSX.
Use -DLIBUSB_PATH=<path> for binary distributions (most likely the
Windows folks)
2013-08-24 19:23:53 -04:00
Jon Szymaniak
df05b174ec libbladeRF & bladeRF-CLI: Fixed build issues. Moved backend config info.
From henceforth, all backend selection should live in the
backend_config.h.in file, so backend.c or backend.h doesn't get muddied
with #ifdef's.
2013-08-13 23:44:42 -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