From 3b8dc5c183b798cd95a0dbc9d93bbbd8b5412fa5 Mon Sep 17 00:00:00 2001
From: akallabeth <akallabeth@posteo.net>
Date: Thu, 29 Aug 2024 08:44:39 +0200
Subject: [PATCH] [cmake] move WITH_VERBOSE_WINPR_ASSERT

Since the definition is common to FreeRDP and WinPR move it to
CommonConfigOptions
---
 CMakeLists.txt                  | 7 -------
 cmake/CommonConfigOptions.cmake | 6 ++++++
 winpr/CMakeLists.txt            | 6 ------
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b9711b90c..f60c67f5c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -702,13 +702,6 @@ endif()
 
 include(CommonConfigOptions)
 
-# WinPR
-# We want to control the winpr assert for the whole project
-option(WITH_VERBOSE_WINPR_ASSERT "Compile with verbose WINPR_ASSERT." ON)
-if (WITH_VERBOSE_WINPR_ASSERT)
-	add_definitions(-DWITH_VERBOSE_WINPR_ASSERT)
-endif()
-
 if (FREERDP_UNIFIED_BUILD)
 	add_subdirectory(winpr)
 	if (WITH_WAYLAND)
diff --git a/cmake/CommonConfigOptions.cmake b/cmake/CommonConfigOptions.cmake
index 65531679f..f483ad5cd 100644
--- a/cmake/CommonConfigOptions.cmake
+++ b/cmake/CommonConfigOptions.cmake
@@ -5,6 +5,12 @@ option(WITH_LIBRARY_VERSIONING "Use library version triplet" ON)
 option(WITH_BINARY_VERSIONING "Use binary versioning" OFF)
 option(BUILD_SHARED_LIBS "Build shared libraries" ON)
 
+# We want to control the winpr assert for the whole project
+option(WITH_VERBOSE_WINPR_ASSERT "Compile with verbose WINPR_ASSERT." ON)
+if (WITH_VERBOSE_WINPR_ASSERT)
+	add_definitions(-DWITH_VERBOSE_WINPR_ASSERT)
+endif()
+
 # known issue on android, thus disabled until we support newer CMake
 # https://github.com/android/ndk/issues/1444
 if (NOT ANDROID)
diff --git a/winpr/CMakeLists.txt b/winpr/CMakeLists.txt
index 7d9b9b961..207397748 100644
--- a/winpr/CMakeLists.txt
+++ b/winpr/CMakeLists.txt
@@ -75,7 +75,6 @@ else()
 	set(WITH_INTERNAL_MD5_DEFAULT OFF)
 endif()
 
-option(WITH_VERBOSE_WINPR_ASSERT "Compile with verbose WINPR_ASSERT." ON)
 option(WITH_WINPR_TOOLS "Build WinPR helper binaries" ${TOOLS_DEFAULT})
 option(WITH_WINPR_DEPRECATED "Build WinPR deprecated symbols" OFF)
 option(WITH_DEBUG_THREADS "Print thread debug messages, enables handle dump" ${DEFAULT_DEBUG_OPTION})
@@ -110,11 +109,6 @@ if (WITH_WINPR_DEPRECATED)
 	add_definitions(-DWITH_WINPR_DEPRECATED)
 endif()
 
-if (WITH_VERBOSE_WINPR_ASSERT)
-	add_definitions(-DWITH_VERBOSE_WINPR_ASSERT)
-endif()
-
-
 # Include cmake modules
 include(CheckIncludeFiles)
 include(CheckLibraryExists)