uhd: use the include subdir macro to simplify the lib subdirs cmakelists

5 files changed, 94 insertions, 85 deletions

diff --git a/host/lib/usrp/CMakeLists.txt b/host/lib/usrp/CMakeLists.txt
index bd26d29a1..9dc74a5fe 100644
--- a/host/lib/usrp/CMakeLists.txt
+++ b/host/lib/usrp/CMakeLists.txt
@@ -15,25 +15,26 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-#This file will be included by cmake, use absolute paths!
-
+########################################################################
+# This file included, use CMake directory variables
+########################################################################
 LIBUHD_APPEND_SOURCES(
-    ${CMAKE_SOURCE_DIR}/lib/usrp/dboard_base.cpp
-    ${CMAKE_SOURCE_DIR}/lib/usrp/dboard_eeprom.cpp
-    ${CMAKE_SOURCE_DIR}/lib/usrp/dboard_id.cpp
-    ${CMAKE_SOURCE_DIR}/lib/usrp/dboard_iface.cpp
-    ${CMAKE_SOURCE_DIR}/lib/usrp/dboard_manager.cpp
-    ${CMAKE_SOURCE_DIR}/lib/usrp/dsp_utils.cpp
-    ${CMAKE_SOURCE_DIR}/lib/usrp/mboard_eeprom.cpp
-    ${CMAKE_SOURCE_DIR}/lib/usrp/misc_utils.cpp
-    ${CMAKE_SOURCE_DIR}/lib/usrp/multi_usrp.cpp
-    ${CMAKE_SOURCE_DIR}/lib/usrp/single_usrp.cpp
-    ${CMAKE_SOURCE_DIR}/lib/usrp/subdev_spec.cpp
-    ${CMAKE_SOURCE_DIR}/lib/usrp/tune_helper.cpp
-    ${CMAKE_SOURCE_DIR}/lib/usrp/wrapper_utils.hpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/dboard_base.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/dboard_eeprom.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/dboard_id.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/dboard_iface.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/dboard_manager.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/dsp_utils.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/mboard_eeprom.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/misc_utils.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/multi_usrp.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/single_usrp.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/subdev_spec.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/tune_helper.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/wrapper_utils.hpp
 )
 
-INCLUDE(${CMAKE_SOURCE_DIR}/lib/usrp/dboard/CMakeLists.txt)
-INCLUDE(${CMAKE_SOURCE_DIR}/lib/usrp/usrp1/CMakeLists.txt)
-INCLUDE(${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/CMakeLists.txt)
-INCLUDE(${CMAKE_SOURCE_DIR}/lib/usrp/usrp_e100/CMakeLists.txt)
+INCLUDE_SUBDIRECTORY(dboard)
+INCLUDE_SUBDIRECTORY(usrp1)
+INCLUDE_SUBDIRECTORY(usrp2)
+INCLUDE_SUBDIRECTORY(usrp_e100)
diff --git a/host/lib/usrp/dboard/CMakeLists.txt b/host/lib/usrp/dboard/CMakeLists.txt
index 79cd42d18..7bd201294 100644
--- a/host/lib/usrp/dboard/CMakeLists.txt
+++ b/host/lib/usrp/dboard/CMakeLists.txt
@@ -15,16 +15,18 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-#This file will be included by cmake, use absolute paths!
+########################################################################
+# This file included, use CMake directory variables
+########################################################################
 
 LIBUHD_APPEND_SOURCES(
-    ${CMAKE_SOURCE_DIR}/lib/usrp/dboard/db_basic_and_lf.cpp
-    ${CMAKE_SOURCE_DIR}/lib/usrp/dboard/db_rfx.cpp
-    ${CMAKE_SOURCE_DIR}/lib/usrp/dboard/db_xcvr2450.cpp
-    ${CMAKE_SOURCE_DIR}/lib/usrp/dboard/db_wbx.cpp
-    ${CMAKE_SOURCE_DIR}/lib/usrp/dboard/db_dbsrx.cpp
-    ${CMAKE_SOURCE_DIR}/lib/usrp/dboard/db_unknown.cpp
-    ${CMAKE_SOURCE_DIR}/lib/usrp/dboard/db_tvrx.cpp
-    ${CMAKE_SOURCE_DIR}/lib/usrp/dboard/db_dbsrx2.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/db_basic_and_lf.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/db_rfx.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/db_xcvr2450.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/db_wbx.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/db_dbsrx.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/db_unknown.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/db_tvrx.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/db_dbsrx2.cpp
 )
 
diff --git a/host/lib/usrp/usrp1/CMakeLists.txt b/host/lib/usrp/usrp1/CMakeLists.txt
index 13db50790..519e17bfa 100644
--- a/host/lib/usrp/usrp1/CMakeLists.txt
+++ b/host/lib/usrp/usrp1/CMakeLists.txt
@@ -15,7 +15,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-#This file will be included by cmake, use absolute paths!
+########################################################################
+# This file included, use CMake directory variables
+########################################################################
 
 ########################################################################
 # Conditionally configure the USRP1 support
@@ -26,21 +28,21 @@ IF(ENABLE_USRP1)
     INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/../firmware/fx2/common)
 
     LIBUHD_APPEND_SOURCES(
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp1/clock_ctrl.cpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp1/clock_ctrl.hpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp1/codec_ctrl.cpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp1/codec_ctrl.hpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp1/codec_impl.cpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp1/dboard_impl.cpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp1/dboard_iface.cpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp1/dsp_impl.cpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp1/io_impl.cpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp1/mboard_impl.cpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp1/usrp1_iface.cpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp1/usrp1_iface.hpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp1/usrp1_impl.cpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp1/usrp1_impl.hpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp1/usrp1_ctrl.cpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp1/usrp1_ctrl.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/clock_ctrl.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/clock_ctrl.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/codec_ctrl.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/codec_ctrl.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/codec_impl.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/dboard_impl.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/dboard_iface.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/dsp_impl.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/io_impl.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/mboard_impl.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/usrp1_iface.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/usrp1_iface.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/usrp1_impl.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/usrp1_impl.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/usrp1_ctrl.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/usrp1_ctrl.hpp
     )
 ENDIF(ENABLE_USRP1)
diff --git a/host/lib/usrp/usrp2/CMakeLists.txt b/host/lib/usrp/usrp2/CMakeLists.txt
index 43f384015..527669852 100644
--- a/host/lib/usrp/usrp2/CMakeLists.txt
+++ b/host/lib/usrp/usrp2/CMakeLists.txt
@@ -15,7 +15,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-#This file will be included by cmake, use absolute paths!
+########################################################################
+# This file included, use CMake directory variables
+########################################################################
 
 ########################################################################
 # Conditionally configure the USRP2 support
@@ -24,25 +26,25 @@ LIBUHD_REGISTER_COMPONENT("USRP2" ENABLE_USRP2 ON "ENABLE_LIBUHD" OFF)
 
 IF(ENABLE_USRP2)
     LIBUHD_APPEND_SOURCES(
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/clock_ctrl.cpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/clock_ctrl.hpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/codec_ctrl.cpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/codec_ctrl.hpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/codec_impl.cpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/dboard_impl.cpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/dboard_iface.cpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/dsp_impl.cpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/gps_ctrl.hpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/gps_ctrl.cpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/io_impl.cpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/mboard_impl.cpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/serdes_ctrl.cpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/serdes_ctrl.hpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/usrp2_iface.cpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/usrp2_iface.hpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/usrp2_impl.cpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/usrp2_impl.hpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/usrp2_regs.hpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/usrp2_regs.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/clock_ctrl.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/clock_ctrl.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/codec_ctrl.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/codec_ctrl.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/codec_impl.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/dboard_impl.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/dboard_iface.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/dsp_impl.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/gps_ctrl.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/gps_ctrl.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/io_impl.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/mboard_impl.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/serdes_ctrl.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/serdes_ctrl.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/usrp2_iface.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/usrp2_iface.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/usrp2_impl.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/usrp2_impl.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/usrp2_regs.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/usrp2_regs.cpp
     )
 ENDIF(ENABLE_USRP2)
diff --git a/host/lib/usrp/usrp_e100/CMakeLists.txt b/host/lib/usrp/usrp_e100/CMakeLists.txt
index 42db82321..5d8a9791d 100644
--- a/host/lib/usrp/usrp_e100/CMakeLists.txt
+++ b/host/lib/usrp/usrp_e100/CMakeLists.txt
@@ -15,7 +15,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-#This file will be included by cmake, use absolute paths!
+########################################################################
+# This file included, use CMake directory variables
+########################################################################
 
 ########################################################################
 # Conditionally configure the USRP-E100 support
@@ -23,25 +25,25 @@
 LIBUHD_REGISTER_COMPONENT("USRP-E100" ENABLE_USRP_E100 OFF "ENABLE_LIBUHD" ON)
 
 IF(ENABLE_USRP_E100)
-    INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/lib/usrp/usrp_e100/include)
+    INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
 
     LIBUHD_APPEND_SOURCES(
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_e100/clock_ctrl.cpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_e100/clock_ctrl.hpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_e100/codec_ctrl.cpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_e100/codec_ctrl.hpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_e100/codec_impl.cpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_e100/dboard_impl.cpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_e100/dboard_iface.cpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_e100/dsp_impl.cpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_e100/fpga-downloader.cc
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_e100/io_impl.cpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_e100/mboard_impl.cpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_e100/usrp_e100_impl.cpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_e100/usrp_e100_impl.hpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_e100/usrp_e100_iface.cpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_e100/usrp_e100_iface.hpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_e100/usrp_e100_mmap_zero_copy.cpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_e100/usrp_e100_regs.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/clock_ctrl.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/clock_ctrl.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/codec_ctrl.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/codec_ctrl.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/codec_impl.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/dboard_impl.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/dboard_iface.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/dsp_impl.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/fpga-downloader.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/io_impl.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/mboard_impl.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/usrp_e100_impl.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/usrp_e100_impl.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/usrp_e100_iface.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/usrp_e100_iface.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/usrp_e100_mmap_zero_copy.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/usrp_e100_regs.hpp
     )
 ENDIF(ENABLE_USRP_E100)