Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@

- Add WinGDK (Gaming.Desktop.x64) platform support ([#1631](https://github.com/getsentry/sentry-native/pull/1631))

**Fixes**:

- Revert `CMP0141` policy that broke debug info settings for downstream consumers. ([#1630](https://github.com/getsentry/sentry-native/pull/1630))

## 0.13.5

**Features**:
Expand Down
5 changes: 0 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,6 @@ if(POLICY CMP0079)
cmake_policy(SET CMP0079 NEW)
endif()

# Enable CMAKE_MSVC_DEBUG_INFORMATION_FORMAT
if(POLICY CMP0141)
cmake_policy(SET CMP0141 NEW)
endif()

# Allow downstream SDKs to override the SDK version at CMake configuration time
set(SENTRY_SDK_VERSION "" CACHE STRING "Override the SDK version (supports full semver format with build metadata)")

Expand Down
4 changes: 4 additions & 0 deletions tests/cmake.py
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ def cmake_configure(cwd, options, cflags=None):
# Use /Z7 instead of /Zi to embed debug info in object files. /Zi creates
# a shared PDB that conflicts with sccache's parallelized compilation.
options["CMAKE_MSVC_DEBUG_INFORMATION_FORMAT"] = "Embedded"
options["CMAKE_POLICY_DEFAULT_CMP0141"] = "NEW"
options.update(
{
"CMAKE_RUNTIME_OUTPUT_DIRECTORY": cwd,
Expand All @@ -153,6 +154,9 @@ def cmake_configure(cwd, options, cflags=None):
"CMAKE_LIBRARY_OUTPUT_DIRECTORY": cwd,
"CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG": cwd,
"CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE": cwd,
"CMAKE_ARCHIVE_OUTPUT_DIRECTORY": cwd,
"CMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG": cwd,
"CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE": cwd,
}
)

Expand Down
3 changes: 0 additions & 3 deletions tests/fixtures/crash_reporter/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
cmake_minimum_required(VERSION 3.10)
if(POLICY CMP0141)
cmake_policy(SET CMP0141 NEW)
endif()
project(sentry_crash_reporter LANGUAGES C)

add_executable(sentry_crash_reporter crash_reporter.c)
Expand Down
3 changes: 0 additions & 3 deletions tests/fixtures/inproc_stress/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
cmake_minimum_required(VERSION 3.10)
if(POLICY CMP0141)
cmake_policy(SET CMP0141 NEW)
endif()
project(inproc_stress_test C)

# SENTRY_LIB_DIR and SENTRY_INCLUDE_DIR are passed from the pytest
Expand Down
3 changes: 0 additions & 3 deletions tests/fixtures/screenshot/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
cmake_minimum_required(VERSION 3.10)
if(POLICY CMP0141)
cmake_policy(SET CMP0141 NEW)
endif()
project(sentry_screenshot LANGUAGES C)

if(WIN32 AND NOT XBOX)
Expand Down
Loading