RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-25 12:12:47 +01:00
Code Issues Projects Releases Wiki Activity

Revert "[CMake] Use write_basic_package_version_file for LLVM"

Browse Source 
This reverts commit 3001d080c813da20b329303bf8f45451480e5905 which
seems to have introduced a race condition that's failing the build
in some cases.
This commit is contained in:
Petr Hosek 2021-03-29 13:07:39 -07:00
parent aca4d512a7
commit a856b70a96
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmake/modules/CMakeLists.txt
View File

@ -127,13 +127,11 @@ configure_file(
${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/LLVMConfig.cmake ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/LLVMConfig.cmake
@ONLY) @ONLY)
# Generate LLVMConfigVersion.cmake for build tree (later copied to install tree). # Generate LLVMConfigVersion.cmake for build and install tree.
include(CMakePackageConfigHelpers) configure_file(
write_basic_package_version_file( LLVMConfigVersion.cmake.in
"${llvm_cmake_builddir}/LLVMConfigVersion.cmake" ${llvm_cmake_builddir}/LLVMConfigVersion.cmake
VERSION "${PACKAGE_VERSION}" @ONLY)
COMPATIBILITY SameMinorVersion
)
if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
get_property(llvm_has_exports GLOBAL PROPERTY LLVM_HAS_EXPORTS) get_property(llvm_has_exports GLOBAL PROPERTY LLVM_HAS_EXPORTS)

13
cmake/modules/LLVMConfigVersion.cmake.in Normal file
View File

@ -0,0 +1,13 @@
set(PACKAGE_VERSION "@PACKAGE_VERSION@")
# LLVM is API-compatible only with matching major.minor versions
# and patch versions not less than that requested.
if("@LLVM_VERSION_MAJOR@.@LLVM_VERSION_MINOR@" VERSION_EQUAL
"${PACKAGE_FIND_VERSION_MAJOR}.${PACKAGE_FIND_VERSION_MINOR}"
AND NOT "@LLVM_VERSION_PATCH@" VERSION_LESS "${PACKAGE_FIND_VERSION_PATCH}")
set(PACKAGE_VERSION_COMPATIBLE 1)
if("@LLVM_VERSION_PATCH@" VERSION_EQUAL
"${PACKAGE_FIND_VERSION_PATCH}")
set(PACKAGE_VERSION_EXACT 1)
endif()
endif()