github/FreeRDP
7
0
Fork 0
mirror of https://github.com/FreeRDP/FreeRDP.git synced 2025-06-03 00:00:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

[cmake] move WITH_VERBOSE_WINPR_ASSERT

Browse Source 
Since the definition is common to FreeRDP and WinPR move it to
CommonConfigOptions
This commit is contained in:
akallabeth 2024-08-29 08:44:39 +02:00
parent efde29f362
commit 3b8dc5c183
No known key found for this signature in database
GPG Key ID: A49454A3FC909FD5
3 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -702,13 +702,6 @@ endif()
include(CommonConfigOptions) 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) if (FREERDP_UNIFIED_BUILD)
add_subdirectory(winpr) add_subdirectory(winpr)
if (WITH_WAYLAND) if (WITH_WAYLAND)

6
cmake/CommonConfigOptions.cmake
View File

@ -5,6 +5,12 @@ option(WITH_LIBRARY_VERSIONING "Use library version triplet" ON)
option(WITH_BINARY_VERSIONING "Use binary versioning" OFF) option(WITH_BINARY_VERSIONING "Use binary versioning" OFF)
option(BUILD_SHARED_LIBS "Build shared libraries" ON) 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 # known issue on android, thus disabled until we support newer CMake
# https://github.com/android/ndk/issues/1444 # https://github.com/android/ndk/issues/1444
if (NOT ANDROID) if (NOT ANDROID)

6
winpr/CMakeLists.txt
View File

@ -75,7 +75,6 @@ else()
set(WITH_INTERNAL_MD5_DEFAULT OFF) set(WITH_INTERNAL_MD5_DEFAULT OFF)
endif() 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_TOOLS "Build WinPR helper binaries" ${TOOLS_DEFAULT})
option(WITH_WINPR_DEPRECATED "Build WinPR deprecated symbols" OFF) option(WITH_WINPR_DEPRECATED "Build WinPR deprecated symbols" OFF)
option(WITH_DEBUG_THREADS "Print thread debug messages, enables handle dump" ${DEFAULT_DEBUG_OPTION}) 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) add_definitions(-DWITH_WINPR_DEPRECATED)
endif() endif()
if (WITH_VERBOSE_WINPR_ASSERT)
add_definitions(-DWITH_VERBOSE_WINPR_ASSERT)
endif()
# Include cmake modules # Include cmake modules
include(CheckIncludeFiles) include(CheckIncludeFiles)
include(CheckLibraryExists) include(CheckLibraryExists)