mirror of
https://github.com/RPCS3/rpcs3.git
synced 2026-06-07 15:44:59 -06:00
Merge 639fbbb16a into 021f16f775
This commit is contained in:
commit
a278d9a5bb
@ -16,6 +16,10 @@ CONFIGURE_ARGS="
|
|||||||
-DUSE_SYSTEM_LIBPNG=ON
|
-DUSE_SYSTEM_LIBPNG=ON
|
||||||
-DUSE_SYSTEM_LIBUSB=ON
|
-DUSE_SYSTEM_LIBUSB=ON
|
||||||
-DUSE_SYSTEM_OPENCV=ON
|
-DUSE_SYSTEM_OPENCV=ON
|
||||||
|
-DFIND_LLVM_VERSION=22.0...99.9
|
||||||
|
-DCMAKE_LINKER_TYPE=lld-devel
|
||||||
|
-DCMAKE_C_USING_LINKER_lld-devel=-fuse-ld=lld-devel
|
||||||
|
-DCMAKE_CXX_USING_LINKER_lld-devel=-fuse-ld=lld-devel
|
||||||
"
|
"
|
||||||
|
|
||||||
# base Clang workaround (missing clang-scan-deps)
|
# base Clang workaround (missing clang-scan-deps)
|
||||||
|
|||||||
4
3rdparty/llvm/CMakeLists.txt
vendored
4
3rdparty/llvm/CMakeLists.txt
vendored
@ -58,12 +58,14 @@ if(WITH_LLVM)
|
|||||||
else()
|
else()
|
||||||
message(STATUS "Using prebuilt or system LLVM")
|
message(STATUS "Using prebuilt or system LLVM")
|
||||||
|
|
||||||
|
set(FIND_LLVM_VERSION "19.1...99.9" CACHE STRING "LLVM version to search for.")
|
||||||
|
|
||||||
if (LLVM_DIR AND NOT IS_ABSOLUTE "${LLVM_DIR}")
|
if (LLVM_DIR AND NOT IS_ABSOLUTE "${LLVM_DIR}")
|
||||||
# change relative LLVM_DIR to be relative to the source dir
|
# change relative LLVM_DIR to be relative to the source dir
|
||||||
set(LLVM_DIR ${CMAKE_SOURCE_DIR}/${LLVM_DIR})
|
set(LLVM_DIR ${CMAKE_SOURCE_DIR}/${LLVM_DIR})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
find_package(LLVM CONFIG)
|
find_package(LLVM ${FIND_LLVM_VERSION} CONFIG)
|
||||||
|
|
||||||
if (NOT LLVM_FOUND)
|
if (NOT LLVM_FOUND)
|
||||||
message(FATAL_ERROR "Can't find LLVM libraries from the CMAKE_PREFIX_PATH path or LLVM_DIR. Enable BUILD_LLVM option to build LLVM from included as a git submodule.")
|
message(FATAL_ERROR "Can't find LLVM libraries from the CMAKE_PREFIX_PATH path or LLVM_DIR. Enable BUILD_LLVM option to build LLVM from included as a git submodule.")
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user