RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2026-04-05 06:26:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

BUILD: a couple of cmake msvc compile fixes (#10799)

Browse source 
* 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:
陈俊嘉 2021-09-12 05:55:53 +08:00 • committed by GitHub
parent 8dc98bbc1b
commit 42e3add6a1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 100 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
3rdparty/7z/CMakeLists.txt vendored
View file

@ -45,7 +45,9 @@ if(WIN32)
src/LzmaLib.c
src/7zCrc.c
src/MtDec.c)
target_include_directories(3rdparty_7z INTERFACE 7z)
target_include_directories(3rdparty_7z INTERFACE
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
$<INSTALL_INTERFACE:/src>)
else()
add_library(3rdparty_7z INTERFACE)
endif()

4
3rdparty/OpenAL/CMakeLists.txt vendored
View file

@ -1,7 +1,7 @@
# OpenAL
if (MSVC)
find_path(OPENAL_INCLUDE_DIR al.h PATHS OpenAL/include)
find_library(OPENAL_LIBRARY OpenAL32 PATHS OpenAL/libs/Win64/)
find_path(OPENAL_INCLUDE_DIR al.h PATHS include/)
find_library(OPENAL_LIBRARY OpenAL32 PATHS libs/Win64/)
else()
find_package(OpenAL REQUIRED)
endif()

3
3rdparty/curl/CMakeLists.txt vendored
View file

@ -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()