diff options
| author | Nicholas Corgan <nick.corgan@ettus.com> | 2014-03-27 07:45:39 -0700 |
|---|---|---|
| committer | Nicholas Corgan <nick.corgan@ettus.com> | 2014-03-27 07:45:39 -0700 |
| commit | 89d36657a177ba3405ffb7a537a3e2f744a1e7ce (patch) | |
| tree | 86c776878716eee0c058eaca28bf9ba4df45ec29 /host/lib | |
| parent | ff98c2a81623bc6ef68912583fada5d5c5a04cb2 (diff) | |
| parent | f08e50934505c5a42a2f3dcf5a65052db07674dc (diff) | |
| download | uhd-89d36657a177ba3405ffb7a537a3e2f744a1e7ce.tar.gz uhd-89d36657a177ba3405ffb7a537a3e2f744a1e7ce.tar.bz2 uhd-89d36657a177ba3405ffb7a537a3e2f744a1e7ce.zip | |
Merge branch 'maint'
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 |