diff --git a/CHANGELOG.md b/CHANGELOG.md index 90da9674bd..8e3fdd9268 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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**: diff --git a/CMakeLists.txt b/CMakeLists.txt index 1a631ae7fe..6c933e9f34 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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)") diff --git a/tests/cmake.py b/tests/cmake.py index 069d5b9577..9e8c00a0a1 100644 --- a/tests/cmake.py +++ b/tests/cmake.py @@ -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, @@ -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, } ) diff --git a/tests/fixtures/crash_reporter/CMakeLists.txt b/tests/fixtures/crash_reporter/CMakeLists.txt index b849039460..c6c4b15537 100644 --- a/tests/fixtures/crash_reporter/CMakeLists.txt +++ b/tests/fixtures/crash_reporter/CMakeLists.txt @@ -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) diff --git a/tests/fixtures/inproc_stress/CMakeLists.txt b/tests/fixtures/inproc_stress/CMakeLists.txt index 95bb49a886..2b664ce153 100644 --- a/tests/fixtures/inproc_stress/CMakeLists.txt +++ b/tests/fixtures/inproc_stress/CMakeLists.txt @@ -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 diff --git a/tests/fixtures/screenshot/CMakeLists.txt b/tests/fixtures/screenshot/CMakeLists.txt index 3f55ec9fbe..bcb4083fef 100644 --- a/tests/fixtures/screenshot/CMakeLists.txt +++ b/tests/fixtures/screenshot/CMakeLists.txt @@ -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)