mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-02-07 14:40:12 +00:00
Code Issues Releases Wiki Activity

Better way to consume google-glog

Browse Source
This commit is contained in:
Carles Fernandez 2024-02-27 13:45:38 +01:00
parent cb42c59554
commit 7a58a3e39b
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -1814,10 +1814,9 @@ ${GNSSSDR_BINARY_DIR}/thirdparty/glog/glog-${GNSSSDR_GLOG_LOCAL_VERSION}/configu
endif() endif()
endif() endif()
if(NOT (CMAKE_VERSION VERSION_LESS "3.22")) 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) set_target_properties(Glog::glog PROPERTIES
if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") INTERFACE_COMPILE_DEFINITIONS "GLOG_USE_GLOG_EXPORT;GLOG_USE_GFLAGS"
set(CMAKE_CXX_COMPILE_OPTIONS_USE_PCH -Winvalid-pch -x c++-header -include ${GNSSSDR_BINARY_DIR}/glog-${GNSSSDR_GLOG_LOCAL_VERSION}/glog/export.h) INTERFACE_COMPILE_FEATURES "cxx_std_14")
endif()
endif() endif()
if(LIBUNWIND_FOUND) if(LIBUNWIND_FOUND)

5
cmake/Modules/FindGLOG.cmake
View File

@ -182,8 +182,5 @@ endif()
# Fix for glog 0.7.0 # Fix for glog 0.7.0
if(EXISTS ${GLOG_INCLUDE_DIRS}/export.h) if(EXISTS ${GLOG_INCLUDE_DIRS}/export.h)
target_precompile_headers(Glog::glog INTERFACE ${GLOG_INCLUDE_DIRS}/export.h) set_target_properties(Glog::glog PROPERTIES INTERFACE_COMPILE_DEFINITIONS "GLOG_USE_GLOG_EXPORT")
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()
endif() endif()