mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xx

Browse Source
This commit is contained in:
akallabeth 2024-11-14 20:15:02 +01:00
parent 4a2d0f96e3
commit 2404d71d8b
4 changed files with 40 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -503,13 +503,8 @@ include(CTest)
if(BUILD_TESTING_INTERNAL OR BUILD_TESTING) if(BUILD_TESTING_INTERNAL OR BUILD_TESTING)
enable_testing() enable_testing()
if(MSVC)
set(TESTING_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}")
else()
set(TESTING_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/Testing") set(TESTING_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/Testing")
endif() endif()
endif()
include(CommonConfigOptions) include(CommonConfigOptions)

1
libfreerdp/core/test/TestSettings.c
View File

@ -1,5 +1,6 @@
#include <stdio.h> #include <stdio.h>
#include <winpr/user.h>
#include <winpr/crypto.h> #include <winpr/crypto.h>
#include <freerdp/settings.h> #include <freerdp/settings.h>

5
winpr/CMakeLists.txt
View File

@ -311,12 +311,7 @@ endif()
endif() endif()
enable_testing() enable_testing()
if(MSVC)
set(TESTING_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}")
else()
set(TESTING_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/Testing") set(TESTING_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/Testing")
endif()
if (NOT WIN32 AND NOT IOS AND NOT ANDROID) if (NOT WIN32 AND NOT IOS AND NOT ANDROID)
set(PKCS11_DEFAULT ON) set(PKCS11_DEFAULT ON)

4
winpr/include/winpr/user.h
View File

@ -27,7 +27,9 @@
* Standard Clipboard Formats * Standard Clipboard Formats
*/ */
#ifndef _WIN32 #ifdef _WIN32
#include <winuser.h>
#else
#define MB_OK 0x00000000L #define MB_OK 0x00000000L
#define MB_OKCANCEL 0x00000001L #define MB_OKCANCEL 0x00000001L