Z991239-527 #comment 声明 spshell需要以管理员身份启动

CMakeLists.txt

@@ -24,22 +24,14 @@ project(RvcFramework)
 
 set(CMAKE_CXX_STANDARD 11)
 
-option(BUILD_TESTING "Build the project test case." OFF)
 
-option(WITH_DEBUG_SYMBOLS "Pack debug symbols to installer" ON)
-
-option(INSTALL_DEVELOP_FILES "install and pack develops header and libs files" OFF)
-
-option(WITH_THIRD_PARTY "Build third-party components" ON)
-
-option(SIMULATE_DEV_AND_TEST_TEMP "/run/version/1.2.3.4/" ON)
 
 #  Include extend cmake scripts
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/addin/cmake/ )
 include(CheckStructHasMember)
 include(CheckIncludeFiles)
 include(CheckSymbolExists)
-
+include(ConfigOptions)
 include(GetGitRevisionDescription)
 
 # include path enviroment for RVC

addin/cmake/ConfigOptions.cmake

@@ -13,155 +13,19 @@ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "sparc")
 	set(TARGET_ARCH "sparc")
 endif()
 
-option(WITH_MANPAGES "Generate manpages." ON)
-option(WITH_PROFILER "Compile profiler." OFF)
-option(WITH_GPROF "Compile with GProf profiler." OFF)
-
-if((TARGET_ARCH MATCHES "x86|x64") AND (NOT DEFINED WITH_SSE2))
-	option(WITH_SSE2 "Enable SSE2 optimization." ON)
-else()
-	option(WITH_SSE2 "Enable SSE2 optimization." OFF)
-endif()
-
 if(TARGET_ARCH MATCHES "ARM")
-	if (NOT DEFINED WITH_NEON)
-		option(WITH_NEON "Enable NEON optimization." ON)
-	else()
-		option(WITH_NEON "Enable NEON optimization." OFF)
-	endif()
+	
 else()
-	if(NOT APPLE)
-		option(WITH_IPP "Use Intel Performance Primitives." OFF)
-	endif()
+	option(WITH_IPP "Use Intel Performance Primitives." OFF)
 endif()
 
-option(WITH_JPEG "Use JPEG decoding." OFF)
-
-if(CMAKE_C_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-	set(CMAKE_COMPILER_IS_CLANG 1)
-endif()
-
-if(NOT WIN32)
-	CMAKE_DEPENDENT_OPTION(WITH_VALGRIND_MEMCHECK "Compile with valgrind helpers." OFF
-		"NOT WITH_SANITIZE_ADDRESS; NOT WITH_SANITIZE_MEMORY; NOT WITH_SANITIZE_THREAD" OFF)
-	CMAKE_DEPENDENT_OPTION(WITH_SANITIZE_ADDRESS "Compile with gcc/clang address sanitizer." OFF
-		"NOT WITH_VALGRIND_MEMCHECK; NOT WITH_SANITIZE_MEMORY; NOT WITH_SANITIZE_THREAD" OFF)
-	CMAKE_DEPENDENT_OPTION(WITH_SANITIZE_MEMORY "Compile with gcc/clang memory sanitizer." OFF
-        "NOT WITH_VALGRIND_MEMCHECK; NOT WITH_SANITIZE_ADDRESS; NOT WITH_SANITIZE_THREAD" OFF)
-	CMAKE_DEPENDENT_OPTION(WITH_SANITIZE_THREAD "Compile with gcc/clang thread sanitizer." OFF
-		"NOT WITH_VALGRIND_MEMCHECK; NOT WITH_SANITIZE_ADDRESS; NOT WITH_SANITIZE_MEMORY" OFF)
-else()
-	if(NOT UWP)
-		option(WITH_MEDIA_FOUNDATION "Enable H264 media foundation decoder." ON)
-	endif()
-endif()
-
-if(WIN32 AND NOT UWP)
-	option(WITH_NATIVE_SSPI "Use native SSPI modules" ON)
-	option(WITH_WINMM "Use Windows Multimedia" ON)
-	option(WITH_WIN8 "Use Windows 8 libraries" OFF)
-endif()
-
-option(WITH_SMARTCARD_INSPECT "Enable SmartCard API Inspector" OFF)
-
-option(BUILD_TESTING "Build unit tests" OFF)
-CMAKE_DEPENDENT_OPTION(TESTS_WTSAPI_EXTRA "Build extra WTSAPI tests (interactive)" OFF "BUILD_TESTING" OFF)
-CMAKE_DEPENDENT_OPTION(BUILD_COMM_TESTS "Build comm related tests (require comm port)" OFF "BUILD_TESTING" OFF)
-
-option(WITH_SAMPLE "Build sample code" OFF)
-
-option(WITH_CLIENT_COMMON "Build client common library" ON)
-cmake_dependent_option(WITH_CLIENT "Build client binaries" ON "WITH_CLIENT_COMMON" OFF)
-
-option(WITH_SERVER "Build server binaries" OFF)
-
-option(BUILTIN_CHANNELS "Combine all channels into their respective base library" ON)
+option(BUILD_TESTING "Build the project test case." OFF)
 
-option(WITH_CHANNELS "Build virtual channel plugins" ON)
+option(WITH_DEBUG_SYMBOLS "Pack debug symbols to installer" ON)
 
-option(WITH_WINPR_TOOLS "Build WinPR helper binaries" ON)
+option(INSTALL_DEVELOP_FILES "install and pack develops header and libs files" OFF)
 
-cmake_dependent_option(WITH_CLIENT_CHANNELS "Build virtual channel plugins" ON
-	"WITH_CLIENT_COMMON;WITH_CHANNELS" OFF)
+option(WITH_THIRD_PARTY "Build third-party components" ON)
 
-cmake_dependent_option(WITH_MACAUDIO "Enable OSX sound backend" ON "APPLE;NOT IOS" OFF)
+option(SIMULATE_DEV_AND_TEST_TEMP "/run/version/1.2.3.4/" ON)
 
-if(WITH_SERVER AND WITH_CHANNELS)
-	option(WITH_SERVER_CHANNELS "Build virtual channel plugins" ON)
-endif()
-
-option(WITH_THIRD_PARTY "Build third-party components" OFF)
-
-option(WITH_CLIENT_INTERFACE "Build clients as a library with an interface" OFF)
-option(WITH_SERVER_INTERFACE "Build servers as a library with an interface" ON)
-
-option(WITH_DEBUG_ALL "Print all debug messages." OFF)
-
-if(WITH_DEBUG_ALL)
-	set(DEFAULT_DEBUG_OPTION "ON")
-else()
-	set(DEFAULT_DEBUG_OPTION "OFF")
-endif()
-
-option(WITH_DEBUG_CERTIFICATE "Print certificate related debug messages." ${DEFAULT_DEBUG_OPTION})
-option(WITH_DEBUG_CAPABILITIES "Print capability negotiation debug messages." ${DEFAULT_DEBUG_OPTION})
-option(WITH_DEBUG_CHANNELS "Print channel manager debug messages." ${DEFAULT_DEBUG_OPTION})
-option(WITH_DEBUG_CLIPRDR "Print clipboard redirection debug messages" ${DEFAULT_DEBUG_OPTION})
-option(WITH_DEBUG_RDPGFX "Print RDPGFX debug messages" ${DEFAULT_DEBUG_OPTION})
-option(WITH_DEBUG_DVC "Print dynamic virtual channel debug messages." ${DEFAULT_DEBUG_OPTION})
-option(WITH_DEBUG_TSMF "Print TSMF virtual channel debug messages." ${DEFAULT_DEBUG_OPTION})
-option(WITH_DEBUG_KBD "Print keyboard related debug messages." ${DEFAULT_DEBUG_OPTION})
-option(WITH_DEBUG_LICENSE "Print license debug messages." ${DEFAULT_DEBUG_OPTION})
-option(WITH_DEBUG_NEGO "Print negotiation related debug messages." ${DEFAULT_DEBUG_OPTION})
-option(WITH_DEBUG_NLA "Print authentication related debug messages." ${DEFAULT_DEBUG_OPTION})
-option(WITH_DEBUG_NTLM "Print NTLM debug messages" ${DEFAULT_DEBUG_OPTION})
-option(WITH_DEBUG_TSG "Print Terminal Server Gateway debug messages" ${DEFAULT_DEBUG_OPTION})
-option(WITH_DEBUG_RAIL "Print RemoteApp debug messages" ${DEFAULT_DEBUG_OPTION})
-option(WITH_DEBUG_RDP "Print RDP debug messages" ${DEFAULT_DEBUG_OPTION})
-option(WITH_DEBUG_RDPEI "Print input virtual channel debug messages" ${DEFAULT_DEBUG_OPTION})
-option(WITH_DEBUG_REDIR "Redirection debug messages" ${DEFAULT_DEBUG_OPTION})
-option(WITH_DEBUG_RDPDR "Rdpdr debug messages" ${DEFAULT_DEBUG_OPTION})
-option(WITH_DEBUG_RFX "Print RemoteFX debug messages." ${DEFAULT_DEBUG_OPTION})
-option(WITH_DEBUG_SCARD "Print smartcard debug messages" ${DEFAULT_DEBUG_OPTION})
-option(WITH_DEBUG_SND "Print rdpsnd debug messages" ${DEFAULT_DEBUG_OPTION})
-option(WITH_DEBUG_SVC "Print static virtual channel debug messages." ${DEFAULT_DEBUG_OPTION})
-option(WITH_DEBUG_TRANSPORT "Print transport debug messages." ${DEFAULT_DEBUG_OPTION})
-option(WITH_DEBUG_THREADS "Print thread debug messages, enables handle dump" ${DEFAULT_DEBUG_OPTION})
-option(WITH_DEBUG_MUTEX "Print mutex debug messages" ${DEFAULT_DEBUG_OPTION})
-option(WITH_DEBUG_TIMEZONE "Print timezone debug messages." ${DEFAULT_DEBUG_OPTION})
-option(WITH_DEBUG_WND "Print window order debug messages" ${DEFAULT_DEBUG_OPTION})
-option(WITH_DEBUG_X11_CLIPRDR "Print X11 clipboard redirection debug messages" ${DEFAULT_DEBUG_OPTION})
-option(WITH_DEBUG_X11_LOCAL_MOVESIZE "Print X11 Client local movesize debug messages" ${DEFAULT_DEBUG_OPTION})
-option(WITH_DEBUG_X11 "Print X11 Client debug messages" ${DEFAULT_DEBUG_OPTION})
-option(WITH_DEBUG_XV "Print XVideo debug messages" ${DEFAULT_DEBUG_OPTION})
-option(WITH_DEBUG_RINGBUFFER "Enable Ringbuffer debug messages" ${DEFAULT_DEBUG_OPTION})
-
-option(WITH_DEBUG_SYMBOLS "Pack debug symbols to installer" OFF)
-option(WITH_CCACHE "Use ccache support if available" ON)
-option(WITH_CLANG_FORMAT "Detect clang-format. run 'cmake --build . --target clangformat' to format." ON)
-option(WITH_ICU "Use ICU for unicode conversion" OFF)
-option(WITH_GSSAPI "Compile support for kerberos authentication. (EXPERIMENTAL)" OFF)
-
-option(WITH_DSP_EXPERIMENTAL "Enable experimental sound encoder/decoder formats" OFF)
-if (WITH_FFMPEG)
-    option(WITH_DSP_FFMPEG "Use FFMPEG for audio encoding/decoding" OFF)
-    option(WITH_VAAPI "Use FFMPEG VAAPI" OFF)
-endif(WITH_FFMPEG)
-
-option(USE_VERSION_FROM_GIT_TAG "Extract FreeRDP version from git tag." OFF)
-
-option(WITH_CAIRO    "Use CAIRO image library for screen resizing" OFF)
-option(WITH_SWSCALE  "Use SWScale image library for screen resizing" OFF)
-
-if (ANDROID)
-	include(ConfigOptionsAndroid)
-endif(ANDROID)
-
-if (IOS)
-	include(ConfigOptionsiOS)
-endif(IOS)
-
-if (WITH_SERVER)
-	# Proxy Options
-	option(WITH_PROXY_MODULES "Compile proxy modules" OFF)
-endif()

winpr/CMakeLists.txt

@@ -85,7 +85,7 @@ else(NOT IOS)
 endif(NOT IOS)
 
 set(OPENSSL_FOUND TRUE)
-set(OPENSSL_INCLUDE_DIR "${CMAKE_BINARY_DIR}/third_party/openssl-1.1.1d/include")
+# set(OPENSSL_INCLUDE_DIR "${CMAKE_BINARY_DIR}/third_party/openssl-1.1.1d/include")
 include_directories(${OPENSSL_INCLUDE_DIR})
 # set(OPENSSL_LIBRARIES crypto)
 set(OPENSSL_VERSION "1.1.1d")
@@ -215,7 +215,7 @@ if(NOT ANDROID AND NOT IOS AND NOT UWP AND WITH_WINPR_TOOLS)
 endif()
 
 if(BUILD_TESTING)
-	add_subdirectory(test)
+	# add_subdirectory(test)
 endif()
 
 if(RVC_BUILD)