AxioDL
/
logvisor
mirror of https://github.com/AxioDL/logvisor.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fetch Sentry as needed; don't reimport fmt unnecessarily

This commit is contained in:
Luke Street 2021-04-13 00:05:09 -04:00
parent 028617d225
commit d874350205
3 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitmodules vendored
View File

@ -2,7 +2,3 @@
path = fmt path = fmt
url = https://github.com/fmtlib/fmt url = https://github.com/fmtlib/fmt
branch = master branch = master
[submodule "sentry"]
path = sentry
url = https://github.com/getsentry/sentry-native.git
branch = master

22
CMakeLists.txt
View File

@ -9,13 +9,16 @@ endif()
include (CMakePackageConfigHelpers) include (CMakePackageConfigHelpers)
add_subdirectory(fmt) if (NOT TARGET fmt)
target_compile_definitions(fmt PUBLIC add_subdirectory(fmt)
target_compile_definitions(fmt PUBLIC
FMT_STRING_ALIAS=1 FMT_STRING_ALIAS=1
FMT_ARM_ABI_COMPATIBILITY=1 FMT_ARM_ABI_COMPATIBILITY=1
FMT_EXCEPTIONS=0) FMT_EXCEPTIONS=0)
target_compile_definitions(fmt INTERFACE target_compile_definitions(fmt INTERFACE
FMT_ENFORCE_COMPILE_STRING=1) FMT_ENFORCE_COMPILE_STRING=1)
set(FMT_LIB fmt)
endif ()
add_library(logvisor add_library(logvisor
lib/logvisor.cpp lib/logvisor.cpp
@ -28,7 +31,12 @@ if ("${SENTRY_DSN}" STREQUAL "")
set(BREAKPAD_CLIENT "") set(BREAKPAD_CLIENT "")
else () else ()
message(STATUS "Enabling Sentry integration") message(STATUS "Enabling Sentry integration")
add_subdirectory(sentry) include(FetchContent)
FetchContent_Declare(sentry
GIT_REPOSITORY https://github.com/getsentry/sentry-native.git
GIT_TAG 5fcb1dc4d1c8b85fc5ab225d29c7394b375fd1e9
)
FetchContent_MakeAvailable(sentry)
target_compile_definitions(logvisor PUBLIC SENTRY_ENABLED=1) target_compile_definitions(logvisor PUBLIC SENTRY_ENABLED=1)
target_compile_definitions(logvisor PRIVATE SENTRY_DSN="${SENTRY_DSN}") target_compile_definitions(logvisor PRIVATE SENTRY_DSN="${SENTRY_DSN}")
set(SENTRY_LIB sentry) set(SENTRY_LIB sentry)
@ -62,7 +70,9 @@ endif()
target_include_directories(logvisor PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>) target_include_directories(logvisor PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>)
install(DIRECTORY include/logvisor DESTINATION include) install(DIRECTORY include/logvisor DESTINATION include)
install(DIRECTORY fmt/include/fmt DESTINATION include) if (FMT_LIB)
install(DIRECTORY fmt/include/fmt DESTINATION include)
endif ()
set(version_config_file "${PROJECT_BINARY_DIR}/logvisorConfigVersion.cmake") set(version_config_file "${PROJECT_BINARY_DIR}/logvisorConfigVersion.cmake")
set(config_file "${PROJECT_BINARY_DIR}/logvisorConfig.cmake") set(config_file "${PROJECT_BINARY_DIR}/logvisorConfig.cmake")
@ -70,7 +80,7 @@ set(config_install_dir "lib/cmake/logvisor")
# Associate target with export # Associate target with export
install( install(
TARGETS logvisor fmt ${SENTRY_LIB} ${BREAKPAD_CLIENT} TARGETS logvisor ${FMT_LIB} ${SENTRY_LIB} ${BREAKPAD_CLIENT}
EXPORT logvisorTargets EXPORT logvisorTargets
ARCHIVE DESTINATION "lib" ARCHIVE DESTINATION "lib"
INCLUDES DESTINATION include # This sets the INTERFACE_INCLUDE_DIRECTORIES property of the target. INCLUDES DESTINATION include # This sets the INTERFACE_INCLUDE_DIRECTORIES property of the target.

1
sentry

@ -1 +0,0 @@
Subproject commit 5fcb1dc4d1c8b85fc5ab225d29c7394b375fd1e9