diff options
| author | Nicholas Corgan <nick.corgan@ettus.com> | 2014-03-20 10:16:55 -0700 |
|---|---|---|
| committer | Nicholas Corgan <nick.corgan@ettus.com> | 2014-03-27 07:45:16 -0700 |
| commit | f08e50934505c5a42a2f3dcf5a65052db07674dc (patch) | |
| tree | 226bd233b1abfdebf1244e8bd0004d402a596d44 /host/lib | |
| parent | ea8890d52c011fa161e17129268bd369628eb603 (diff) | |
| download | uhd-f08e50934505c5a42a2f3dcf5a65052db07674dc.tar.gz uhd-f08e50934505c5a42a2f3dcf5a65052db07674dc.tar.bz2 uhd-f08e50934505c5a42a2f3dcf5a65052db07674dc.zip | |
nirio: improved dealing with unsupported OS's
* Instead of specifically checking for Apple, default to unsupported iface file if unsupported OS is detected
* Don't error out if we can't catch a specific unsupported OS, just use barebones "unsupported" structs
Diffstat (limited to 'host/lib')
| -rw-r--r-- | host/lib/transport/nirio/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | host/lib/transport/nirio/nirio_driver_iface_unsupported.cpp (renamed from host/lib/transport/nirio/nirio_driver_iface_macos.cpp) | 0 |
2 files changed, 4 insertions, 6 deletions
diff --git a/host/lib/transport/nirio/CMakeLists.txt b/host/lib/transport/nirio/CMakeLists.txt index 6a33da6c5..5f12e91df 100644 --- a/host/lib/transport/nirio/CMakeLists.txt +++ b/host/lib/transport/nirio/CMakeLists.txt @@ -39,10 +39,8 @@ LIBUHD_APPEND_SOURCES( IF(WIN32) LIBUHD_APPEND_SOURCES(${CMAKE_CURRENT_SOURCE_DIR}/nirio_driver_iface_win.cpp) -ELSE(WIN32) - IF(APPLE) - LIBUHD_APPEND_SOURCES(${CMAKE_CURRENT_SOURCE_DIR}/nirio_driver_iface_macos.cpp) - ELSE(APPLE) - LIBUHD_APPEND_SOURCES(${CMAKE_CURRENT_SOURCE_DIR}/nirio_driver_iface_linux.cpp) - ENDIF(APPLE) +ELSEIF(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") #Built-in variable encompasses all UNIX-like systems + LIBUHD_APPEND_SOURCES(${CMAKE_CURRENT_SOURCE_DIR}/nirio_driver_iface_linux.cpp) +ELSE() + LIBUHD_APPEND_SOURCES(${CMAKE_CURRENT_SOURCE_DIR}/nirio_driver_iface_unsupported.cpp) ENDIF(WIN32) diff --git a/host/lib/transport/nirio/nirio_driver_iface_macos.cpp b/host/lib/transport/nirio/nirio_driver_iface_unsupported.cpp index 1a1142525..1a1142525 100644 --- a/host/lib/transport/nirio/nirio_driver_iface_macos.cpp +++ b/host/lib/transport/nirio/nirio_driver_iface_unsupported.cpp |