luo980/cpptrace
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix zstd/libdwarf setting placement, they need to not just be top-level

Browse Source
This commit is contained in:
Jeremy 2024-07-12 16:59:27 -05:00
parent 7497bf2a6f
commit dbeb12b71d
No known key found for this signature in database
GPG Key ID: 19AA8270105E8EB4
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
cmake/OptionVariables.cmake
View File

@ -154,23 +154,11 @@ if(PROJECT_IS_TOP_LEVEL)
option(CPPTRACE_BUILD_TESTING_SPLIT_DWARF "" OFF) option(CPPTRACE_BUILD_TESTING_SPLIT_DWARF "" OFF)
set(CPPTRACE_BUILD_TESTING_DWARF_VERSION "0" CACHE STRING "") set(CPPTRACE_BUILD_TESTING_DWARF_VERSION "0" CACHE STRING "")
option(CPPTRACE_BUILD_TEST_RDYNAMIC "" OFF) option(CPPTRACE_BUILD_TEST_RDYNAMIC "" OFF)
set(CPPTRACE_ZSTD_REPO "https://github.com/facebook/zstd.git" CACHE STRING "")
set(CPPTRACE_ZSTD_TAG "63779c798237346c2b245c546c40b72a5a5913fe" CACHE STRING "") # v1.5.5
set(CPPTRACE_ZSTD_SHALLOW "1" CACHE STRING "")
set(CPPTRACE_LIBDWARF_REPO "https://github.com/jeremy-rifkin/libdwarf-lite.git" CACHE STRING "")
set(CPPTRACE_LIBDWARF_TAG "6dbcc23dba6ffd230063bda4b9d7298bf88d9d41" CACHE STRING "") # v0.10.1
set(CPPTRACE_LIBDWARF_SHALLOW "1" CACHE STRING "")
mark_as_advanced( mark_as_advanced(
CPPTRACE_BUILD_TESTING CPPTRACE_BUILD_TESTING
CPPTRACE_BUILD_TESTING_SPLIT_DWARF CPPTRACE_BUILD_TESTING_SPLIT_DWARF
CPPTRACE_BUILD_TESTING_DWARF_VERSION CPPTRACE_BUILD_TESTING_DWARF_VERSION
CPPTRACE_BUILD_TEST_RDYNAMIC CPPTRACE_BUILD_TEST_RDYNAMIC
CPPTRACE_ZSTD_REPO
CPPTRACE_ZSTD_TAG
CPPTRACE_ZSTD_SHALLOW
CPPTRACE_LIBDWARF_REPO
CPPTRACE_LIBDWARF_TAG
CPPTRACE_LIBDWARF_SHALLOW
) )
endif() endif()
@ -184,6 +172,12 @@ option(CPPTRACE_WERROR_BUILD "" OFF)
option(CPPTRACE_POSITION_INDEPENDENT_CODE "" ON) option(CPPTRACE_POSITION_INDEPENDENT_CODE "" ON)
option(CPPTRACE_SKIP_UNIT "" OFF) option(CPPTRACE_SKIP_UNIT "" OFF)
option(CPPTRACE_USE_EXTERNAL_GTEST "" OFF) option(CPPTRACE_USE_EXTERNAL_GTEST "" OFF)
set(CPPTRACE_ZSTD_REPO "https://github.com/facebook/zstd.git" CACHE STRING "")
set(CPPTRACE_ZSTD_TAG "63779c798237346c2b245c546c40b72a5a5913fe" CACHE STRING "") # v1.5.5
set(CPPTRACE_ZSTD_SHALLOW "1" CACHE STRING "")
set(CPPTRACE_LIBDWARF_REPO "https://github.com/jeremy-rifkin/libdwarf-lite.git" CACHE STRING "")
set(CPPTRACE_LIBDWARF_TAG "6dbcc23dba6ffd230063bda4b9d7298bf88d9d41" CACHE STRING "") # v0.10.1
set(CPPTRACE_LIBDWARF_SHALLOW "1" CACHE STRING "")
mark_as_advanced( mark_as_advanced(
CPPTRACE_BACKTRACE_PATH CPPTRACE_BACKTRACE_PATH
@ -195,4 +189,10 @@ mark_as_advanced(
CPPTRACE_VCPKG CPPTRACE_VCPKG
CPPTRACE_SKIP_UNIT CPPTRACE_SKIP_UNIT
CPPTRACE_USE_EXTERNAL_GTEST CPPTRACE_USE_EXTERNAL_GTEST
CPPTRACE_ZSTD_REPO
CPPTRACE_ZSTD_TAG
CPPTRACE_ZSTD_SHALLOW
CPPTRACE_LIBDWARF_REPO
CPPTRACE_LIBDWARF_TAG
CPPTRACE_LIBDWARF_SHALLOW
) )