aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2011-04-01 15:54:51 -0700
committerJosh Blum <josh@joshknows.com>2011-04-01 15:54:51 -0700
commit83c608e17de45fd5372f05b54f343c721e25ad82 (patch)
treeb3d45a0f92af296d8c67451ccc90e398a60e3ba2
parent81e891f3f38259e7450b454933c979f2d8c93d65 (diff)
downloaduhd-83c608e17de45fd5372f05b54f343c721e25ad82.tar.gz
uhd-83c608e17de45fd5372f05b54f343c721e25ad82.tar.bz2
uhd-83c608e17de45fd5372f05b54f343c721e25ad82.zip
uhd: define LINUX in build system to simplify some checks
-rw-r--r--host/Modules/UHDPackage.cmake4
-rw-r--r--host/lib/usrp/usrp_e100/CMakeLists.txt6
-rw-r--r--host/usrp_e_utils/CMakeLists.txt6
3 files changed, 6 insertions, 10 deletions
diff --git a/host/Modules/UHDPackage.cmake b/host/Modules/UHDPackage.cmake
index 7fee51741..7ac677d28 100644
--- a/host/Modules/UHDPackage.cmake
+++ b/host/Modules/UHDPackage.cmake
@@ -29,6 +29,10 @@ IF(UNIX AND EXISTS "/etc/redhat-release")
SET(REDHAT TRUE)
ENDIF()
+IF(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+ SET(LINUX TRUE)
+ENDIF(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+
########################################################################
# Setup package file name
########################################################################
diff --git a/host/lib/usrp/usrp_e100/CMakeLists.txt b/host/lib/usrp/usrp_e100/CMakeLists.txt
index acbac177e..d0e20a3d8 100644
--- a/host/lib/usrp/usrp_e100/CMakeLists.txt
+++ b/host/lib/usrp/usrp_e100/CMakeLists.txt
@@ -22,11 +22,7 @@
########################################################################
# Conditionally configure the USRP-E100 support
########################################################################
-IF(CMAKE_SYSTEM_NAME STREQUAL "Linux")
- SET(LINUX_TARGET TRUE)
-ENDIF(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-
-LIBUHD_REGISTER_COMPONENT("USRP-E100" ENABLE_USRP_E100 OFF "ENABLE_LIBUHD;LINUX_TARGET" OFF)
+LIBUHD_REGISTER_COMPONENT("USRP-E100" ENABLE_USRP_E100 OFF "ENABLE_LIBUHD;LINUX" OFF)
IF(ENABLE_USRP_E100)
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
diff --git a/host/usrp_e_utils/CMakeLists.txt b/host/usrp_e_utils/CMakeLists.txt
index f3537e542..e7d6ae4b8 100644
--- a/host/usrp_e_utils/CMakeLists.txt
+++ b/host/usrp_e_utils/CMakeLists.txt
@@ -18,11 +18,7 @@
########################################################################
# USRP embedded utilities that get installed into the share path
########################################################################
-IF(CMAKE_SYSTEM_NAME STREQUAL "Linux")
- SET(LINUX_TARGET TRUE)
-ENDIF(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-
-LIBUHD_REGISTER_COMPONENT("USRP-E Utils" ENABLE_USRP_E_UTILS OFF "LINUX_TARGET" OFF)
+LIBUHD_REGISTER_COMPONENT("USRP-E Utils" ENABLE_USRP_E_UTILS OFF "LINUX" OFF)
IF(ENABLE_USRP_E_UTILS)
ENABLE_LANGUAGE(C)