mirror of
https://github.com/RPCS3/rpcs3.git
synced 2025-07-13 02:08:49 +12:00
BUILD: a couple of cmake msvc compile fixes (#10799)
* cmake: a couple of msvc compile fixes Throw error when using multi-config generators. Add USE_MSVC_STATIC_CRT option for statically linking with CRT. Set curl's CURL_STATIC_CRT aligned with USE_MSVC_STATIC_CRT. Fix cmake configs of 7z and OpenAL in msvc build. Remove unecessary hard coded compiling and linking flags. Use debug option in windeployqt when configuring for a debug build. Search for windeployqt tool in configure time. Add vcpkg's Qt support. * Fix some typos
This commit is contained in:
parent
8dc98bbc1b
commit
42e3add6a1
6 changed files with 100 additions and 10 deletions
3
3rdparty/curl/CMakeLists.txt
vendored
3
3rdparty/curl/CMakeLists.txt
vendored
|
@ -12,5 +12,8 @@ else()
|
|||
option(HTTP_ONLY "disables all protocols except HTTP (This overrides all CURL_DISABLE_* options)" ON)
|
||||
option(CURL_ZLIB "Set to ON to enable building curl with zlib support." OFF)
|
||||
set(CURL_CA_PATH "none" CACHE STRING "Location of default CA path. Set 'none' to disable or 'auto' for auto-detection. Defaults to 'auto'.")
|
||||
if(USE_MSVC_STATIC_CRT)
|
||||
set(CURL_STATIC_CRT ON CACHE BOOL "Use static crt to build curl" FORCE)
|
||||
endif()
|
||||
add_subdirectory(curl EXCLUDE_FROM_ALL)
|
||||
endif()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue