From dccc4edc2fc8e0a571a6773d803bfccc17c5cf60 Mon Sep 17 00:00:00 2001 From: Robert Ghilduta Date: Fri, 1 Dec 2017 22:16:23 -0800 Subject: [PATCH] Filenames are starting to become ambiguous without full pathnames --- host/common/include/log.h | 2 ++ host/libraries/libbladeRF/CMakeLists.txt | 2 -- host/libraries/libbladeRF_test/test_fw_check/CMakeLists.txt | 3 --- host/libraries/libbladeRF_test/test_sync/CMakeLists.txt | 3 --- host/utilities/bladeRF-cli/CMakeLists.txt | 2 -- 5 files changed, 2 insertions(+), 10 deletions(-) diff --git a/host/common/include/log.h b/host/common/include/log.h index b0f51294..f08421c4 100644 --- a/host/common/include/log.h +++ b/host/common/include/log.h @@ -39,7 +39,9 @@ extern "C" { #ifdef SHORT_FILE_ # define THIS_FILE SHORT_FILE_ #else +#if 0 # warning "SHORT_FILE_ was not defined. Using __FILE__ instead." +#endif # define THIS_FILE __FILE__ #endif diff --git a/host/libraries/libbladeRF/CMakeLists.txt b/host/libraries/libbladeRF/CMakeLists.txt index 417f8542..f492f73a 100644 --- a/host/libraries/libbladeRF/CMakeLists.txt +++ b/host/libraries/libbladeRF/CMakeLists.txt @@ -360,8 +360,6 @@ if(MSVC) endif() endif() -set(SRC_TO_SHORTEN ${LIBBLADERF_SOURCE}) -include(ShortFileMacro) add_library(libbladerf_shared SHARED ${LIBBLADERF_SOURCE}) ################################################################################ diff --git a/host/libraries/libbladeRF_test/test_fw_check/CMakeLists.txt b/host/libraries/libbladeRF_test/test_fw_check/CMakeLists.txt index 10244d9b..37c698d0 100644 --- a/host/libraries/libbladeRF_test/test_fw_check/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/test_fw_check/CMakeLists.txt @@ -19,9 +19,6 @@ set(SRC ${BLADERF_HOST_COMMON_SOURCE_DIR}/log.c ) -set(SRC_TO_SHORTEN ${SRC}) -include(ShortFileMacro) - add_definitions(-DLOGGING_ENABLED) add_definitions(-DTEST_FX3_FW_VALIDATION) add_definitions(-DLIBBLADERF_SEARCH_PREFIX="${CMAKE_INSTALL_PREFIX}") diff --git a/host/libraries/libbladeRF_test/test_sync/CMakeLists.txt b/host/libraries/libbladeRF_test/test_sync/CMakeLists.txt index 495b40cf..3c7c0f6a 100644 --- a/host/libraries/libbladeRF_test/test_sync/CMakeLists.txt +++ b/host/libraries/libbladeRF_test/test_sync/CMakeLists.txt @@ -36,9 +36,6 @@ if(MSVC) ) endif() -set(SRC_TO_SHORTEN ${SRC}) -include(ShortFileMacro) - include_directories(${TEST_SYNC_INCLUDES}) add_executable(libbladeRF_test_sync ${SRC}) target_link_libraries(libbladeRF_test_sync ${TEST_SYNC_LIBS}) diff --git a/host/utilities/bladeRF-cli/CMakeLists.txt b/host/utilities/bladeRF-cli/CMakeLists.txt index 92add04e..ab69ac1e 100644 --- a/host/utilities/bladeRF-cli/CMakeLists.txt +++ b/host/utilities/bladeRF-cli/CMakeLists.txt @@ -187,8 +187,6 @@ if(APPLE) ) endif() -set(SRC_TO_SHORTEN ${BLADERF_CLI_SOURCE}) -include(ShortFileMacro) add_executable(bladeRF-cli ${BLADERF_CLI_SOURCE}) ################################################################################