RPCS3/llvm
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm.git synced 2025-01-31 07:43:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Revert "Raising minimum required CMake version to 2.8.12.2.""

Browse Source 
This reverts commit r230240, which was an accidental commit.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@230246 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chad Rosier 2015-02-23 19:34:04 +00:00
parent 308458a98b
commit 9659f43f10
5 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
CMakeLists.txt
View File

@ -1,24 +1,14 @@
# See docs/CMake.html for instructions about how to build LLVM with CMake. # See docs/CMake.html for instructions about how to build LLVM with CMake.
cmake_minimum_required(VERSION 2.8.8) cmake_minimum_required(VERSION 2.8.12.2)
if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
message(STATUS "No build type selected, default to Debug") message(STATUS "No build type selected, default to Debug")
set(CMAKE_BUILD_TYPE "Debug") set(CMAKE_BUILD_TYPE "Debug")
endif() endif()
# FIXME: It may be removed when we use 2.8.12. if(POLICY CMP0022)
if(CMAKE_VERSION VERSION_LESS 2.8.12) cmake_policy(SET CMP0022 NEW) # automatic when 2.8.12 is required
# Invalidate a couple of keywords.
set(cmake_2_8_12_INTERFACE)
set(cmake_2_8_12_PRIVATE)
else()
# Use ${cmake_2_8_12_KEYWORD} intead of KEYWORD in target_link_libraries().
set(cmake_2_8_12_INTERFACE INTERFACE)
set(cmake_2_8_12_PRIVATE PRIVATE)
if(POLICY CMP0022)
cmake_policy(SET CMP0022 NEW) # automatic when 2.8.12 is required
endif()
endif() endif()
if(CMAKE_VERSION VERSION_LESS 3.1.20141117) if(CMAKE_VERSION VERSION_LESS 3.1.20141117)

4
cmake/modules/LLVM-Config.cmake
View File

@ -41,9 +41,9 @@ function(explicit_llvm_config executable)
llvm_map_components_to_libnames(LIBRARIES ${link_components}) llvm_map_components_to_libnames(LIBRARIES ${link_components})
get_target_property(t ${executable} TYPE) get_target_property(t ${executable} TYPE)
if("x${t}" STREQUAL "xSTATIC_LIBRARY") if("x${t}" STREQUAL "xSTATIC_LIBRARY")
target_link_libraries(${executable} ${cmake_2_8_12_INTERFACE} ${LIBRARIES}) target_link_libraries(${executable} INTERFACE ${LIBRARIES})
elseif("x${t}" STREQUAL "xSHARED_LIBRARY" OR "x${t}" STREQUAL "xMODULE_LIBRARY") elseif("x${t}" STREQUAL "xSHARED_LIBRARY" OR "x${t}" STREQUAL "xMODULE_LIBRARY")
target_link_libraries(${executable} ${cmake_2_8_12_PRIVATE} ${LIBRARIES}) target_link_libraries(${executable} PRIVATE ${LIBRARIES})
else() else()
# Use plain form for legacy user. # Use plain form for legacy user.
target_link_libraries(${executable} ${LIBRARIES}) target_link_libraries(${executable} ${LIBRARIES})

2
lib/DebugInfo/PDB/CMakeLists.txt
View File

@ -73,4 +73,4 @@ add_llvm_library(LLVMDebugInfoPDB
${LIBPDB_ADDITIONAL_HEADER_DIRS} ${LIBPDB_ADDITIONAL_HEADER_DIRS}
) )
target_link_libraries(LLVMDebugInfoPDB ${cmake_2_8_12_INTERFACE} "${LIBPDB_ADDITIONAL_LIBRARIES}") target_link_libraries(LLVMDebugInfoPDB INTERFACE "${LIBPDB_ADDITIONAL_LIBRARIES}")

2
lib/ExecutionEngine/Interpreter/CMakeLists.txt
View File

@ -13,7 +13,7 @@ add_llvm_library(LLVMInterpreter
) )
if( LLVM_ENABLE_FFI ) if( LLVM_ENABLE_FFI )
target_link_libraries( LLVMInterpreter ${cmake_2_8_12_PRIVATE} ${FFI_LIBRARY_PATH} ) target_link_libraries( LLVMInterpreter PRIVATE ${FFI_LIBRARY_PATH} )
endif() endif()
add_dependencies(LLVMInterpreter intrinsics_gen) add_dependencies(LLVMInterpreter intrinsics_gen)

2
tools/llvm-shlib/CMakeLists.txt
View File

@ -90,7 +90,7 @@ if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") # FIXME: It should be "GNU ld for el
set(LIB_NAMES -Wl,--whole-archive ${LIB_NAMES} -Wl,--no-whole-archive) set(LIB_NAMES -Wl,--whole-archive ${LIB_NAMES} -Wl,--no-whole-archive)
endif() endif()
target_link_libraries(LLVM ${cmake_2_8_12_PRIVATE} ${LIB_NAMES}) target_link_libraries(LLVM PRIVATE ${LIB_NAMES})
add_dependencies(LLVM libLLVMExports) add_dependencies(LLVM libLLVMExports)