RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-22 02:32:36 +01:00
Code Issues Releases Wiki Activity

Fixes build issue with LLVM on Windows with cmake (#10776)

Browse Source 
LLVM fails to build on Windows with C++ 20 standard.  When building LLVM
on Windows, we use C++ 14 already.  This commit changes the c++ standard
to be picked by each subdirectory rather than the standard being picked
by the root level cmake file.
This commit is contained in:
Justin Lewis 2021-08-31 05:07:49 -05:00 committed by GitHub
parent 1e108d97b2
commit ae491f04a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdparty/CMakeLists.txt vendored
View File

@ -2,6 +2,8 @@ find_package(PkgConfig)
include(ExternalProject) include(ExternalProject)
include(CMakeDependentOption) include(CMakeDependentOption)
set(CMAKE_CXX_STANDARD 20)
# Dummy target to use when lib isn't available # Dummy target to use when lib isn't available
add_library(3rdparty_dummy_lib INTERFACE) add_library(3rdparty_dummy_lib INTERFACE)

1
CMakeLists.txt
View File

@ -26,7 +26,6 @@ option(USE_PRECOMPILED_HEADERS "Use precompiled headers" OFF)
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/buildfiles/cmake") set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/buildfiles/cmake")
set(CMAKE_CXX_STANDARD 20)
include(CheckCXXCompilerFlag) include(CheckCXXCompilerFlag)
if(NOT CMAKE_BUILD_TYPE) if(NOT CMAKE_BUILD_TYPE)

2
rpcs3/CMakeLists.txt
View File

@ -10,6 +10,8 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/git-version.cmake)
include(ConfigureCompiler) include(ConfigureCompiler)
include(CheckFunctionExists) include(CheckFunctionExists)
set(CMAKE_CXX_STANDARD 20)
set(ADDITIONAL_LIBS "") set(ADDITIONAL_LIBS "")
if(CMAKE_SYSTEM MATCHES "Linux") if(CMAKE_SYSTEM MATCHES "Linux")
#on some Linux distros shm_unlink and similar functions are in librt only #on some Linux distros shm_unlink and similar functions are in librt only