From 4a8847997274e836bc8fc47d032bdc1bf33dcd7d Mon Sep 17 00:00:00 2001 From: Jim Melton Date: Mon, 15 Feb 2021 14:04:54 -0700 Subject: [PATCH] reverted LOG4CPP work-around The existing CMake logic is broken-ish; or rather log4cpp is broken-ish, and this inhibits the use of C++17 std::filesystem. All of the static libraries created are brittle; consider changing from STATIC to OBJECT in the future? --- CMakeLists.txt | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e9523274c..df28a6ecb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -607,7 +607,7 @@ if(NOT ENABLE_OWN_GPSTK) PURPOSE "Used in some Extra Tests." ) endif() -#if(NOT (GNURADIO_VERSION VERSION_LESS 3.8) AND LOG4CPP_READY_FOR_CXX17) +if(NOT (GNURADIO_VERSION VERSION_LESS 3.8) AND LOG4CPP_READY_FOR_CXX17) # Check if we have std::filesystem if(NOT (CMAKE_VERSION VERSION_LESS 3.8)) if(NOT GPSTK_FOUND OR NOT (GPSTK_FOUND AND GPSTK_OLDER_THAN_8)) # Fix for GPSTk < 8.0.0 @@ -628,12 +628,7 @@ endif() set(CMAKE_CXX_STANDARD_REQUIRED ON) endif() endif() -#endif() -message(ALERT " debugging CMake ..." -"\n GNURADIO_VERSION=${GNURADIO_VERSION}" -#"\n LOG4CPP_READY_FOR_CXX17=${LOG4CPP_READY_FOR_CXX17}" -"\n CMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}" -) +endif()