From 7a58a3e39b924c282e133521da1876c74169de9f Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Tue, 27 Feb 2024 13:45:38 +0100 Subject: [PATCH] Better way to consume google-glog --- CMakeLists.txt | 7 +++---- cmake/Modules/FindGLOG.cmake | 5 +---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 02724fe03..889c6e09c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1814,10 +1814,9 @@ ${GNSSSDR_BINARY_DIR}/thirdparty/glog/glog-${GNSSSDR_GLOG_LOCAL_VERSION}/configu endif() endif() if(NOT (CMAKE_VERSION VERSION_LESS "3.22")) - target_precompile_headers(Glog::glog INTERFACE ${GNSSSDR_BINARY_DIR}/glog-${GNSSSDR_GLOG_LOCAL_VERSION}/glog/export.h) - if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") - set(CMAKE_CXX_COMPILE_OPTIONS_USE_PCH -Winvalid-pch -x c++-header -include ${GNSSSDR_BINARY_DIR}/glog-${GNSSSDR_GLOG_LOCAL_VERSION}/glog/export.h) - endif() + set_target_properties(Glog::glog PROPERTIES + INTERFACE_COMPILE_DEFINITIONS "GLOG_USE_GLOG_EXPORT;GLOG_USE_GFLAGS" + INTERFACE_COMPILE_FEATURES "cxx_std_14") endif() if(LIBUNWIND_FOUND) diff --git a/cmake/Modules/FindGLOG.cmake b/cmake/Modules/FindGLOG.cmake index 3bec26aa9..6c506643e 100644 --- a/cmake/Modules/FindGLOG.cmake +++ b/cmake/Modules/FindGLOG.cmake @@ -182,8 +182,5 @@ endif() # Fix for glog 0.7.0 if(EXISTS ${GLOG_INCLUDE_DIRS}/export.h) - target_precompile_headers(Glog::glog INTERFACE ${GLOG_INCLUDE_DIRS}/export.h) - if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") - set(CMAKE_CXX_COMPILE_OPTIONS_USE_PCH -Winvalid-pch -x c++-header -include ${GLOG_INCLUDE_DIRS}/export.h) - endif() + set_target_properties(Glog::glog PROPERTIES INTERFACE_COMPILE_DEFINITIONS "GLOG_USE_GLOG_EXPORT") endif() \ No newline at end of file