[llvm] r230240 - Revert "Raising minimum required CMake version to 2.8.12.2."

Chad Rosier mcrosier at codeaurora.org
Mon Feb 23 11:39:58 PST 2015


This was an accidental commit!  This revert has been reverted in r230246.


> Two things:
>
> a) Explain why please.
> b) No git hashes in your revert messages, please use the svn revision.
>
> Thanks!
>
> -eric
>
> On Mon Feb 23 2015 at 11:25:31 AM Chad Rosier <mcrosier at codeaurora.org>
> wrote:
>
>> Author: mcrosier
>> Date: Mon Feb 23 13:15:08 2015
>> New Revision: 230240
>>
>> URL: http://llvm.org/viewvc/llvm-project?rev=230240&view=rev
>> Log:
>> Revert "Raising minimum required CMake version to 2.8.12.2."
>>
>> This reverts commit 247aed4710e8befde76da42b27313661dea7cf66.
>>
>> Modified:
>>     llvm/trunk/CMakeLists.txt
>>     llvm/trunk/cmake/modules/LLVM-Config.cmake
>>     llvm/trunk/lib/DebugInfo/PDB/CMakeLists.txt
>>     llvm/trunk/lib/ExecutionEngine/Interpreter/CMakeLists.txt
>>     llvm/trunk/tools/llvm-shlib/CMakeLists.txt
>>
>> Modified: llvm/trunk/CMakeLists.txt
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/CMakeLists.
>> txt?rev=230240&r1=230239&r2=230240&view=diff
>> ============================================================
>> ==================
>> --- llvm/trunk/CMakeLists.txt (original)
>> +++ llvm/trunk/CMakeLists.txt Mon Feb 23 13:15:08 2015
>> @@ -1,14 +1,24 @@
>>  # See docs/CMake.html for instructions about how to build LLVM with
>> CMake.
>>
>> -cmake_minimum_required(VERSION 2.8.12.2)
>> +cmake_minimum_required(VERSION 2.8.8)
>>
>>  if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
>>    message(STATUS "No build type selected, default to Debug")
>>    set(CMAKE_BUILD_TYPE "Debug")
>>  endif()
>>
>> -if(POLICY CMP0022)
>> -  cmake_policy(SET CMP0022 NEW) # automatic when 2.8.12 is required
>> +# FIXME: It may be removed when we use 2.8.12.
>> +if(CMAKE_VERSION VERSION_LESS 2.8.12)
>> +  # 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()
>>
>>  if(CMAKE_VERSION VERSION_LESS 3.1.20141117)
>>
>> Modified: llvm/trunk/cmake/modules/LLVM-Config.cmake
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/
>> modules/LLVM-Config.cmake?rev=230240&r1=230239&r2=230240&view=diff
>> ============================================================
>> ==================
>> --- llvm/trunk/cmake/modules/LLVM-Config.cmake (original)
>> +++ llvm/trunk/cmake/modules/LLVM-Config.cmake Mon Feb 23 13:15:08 2015
>> @@ -41,9 +41,9 @@ function(explicit_llvm_config executable
>>    llvm_map_components_to_libnames(LIBRARIES ${link_components})
>>    get_target_property(t ${executable} TYPE)
>>    if("x${t}" STREQUAL "xSTATIC_LIBRARY")
>> -    target_link_libraries(${executable} INTERFACE ${LIBRARIES})
>> +    target_link_libraries(${executable} ${cmake_2_8_12_INTERFACE}
>> ${LIBRARIES})
>>    elseif("x${t}" STREQUAL "xSHARED_LIBRARY" OR "x${t}" STREQUAL
>> "xMODULE_LIBRARY")
>> -    target_link_libraries(${executable} PRIVATE ${LIBRARIES})
>> +    target_link_libraries(${executable} ${cmake_2_8_12_PRIVATE}
>> ${LIBRARIES})
>>    else()
>>      # Use plain form for legacy user.
>>      target_link_libraries(${executable} ${LIBRARIES})
>>
>> Modified: llvm/trunk/lib/DebugInfo/PDB/CMakeLists.txt
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/
>> DebugInfo/PDB/CMakeLists.txt?rev=230240&r1=230239&r2=230240&view=diff
>> ============================================================
>> ==================
>> --- llvm/trunk/lib/DebugInfo/PDB/CMakeLists.txt (original)
>> +++ llvm/trunk/lib/DebugInfo/PDB/CMakeLists.txt Mon Feb 23 13:15:08 2015
>> @@ -73,4 +73,4 @@ add_llvm_library(LLVMDebugInfoPDB
>>    ${LIBPDB_ADDITIONAL_HEADER_DIRS}
>>    )
>>
>> -target_link_libraries(LLVMDebugInfoPDB INTERFACE "${LIBPDB_ADDITIONAL_
>> LIBRARIES}")
>> +target_link_libraries(LLVMDebugInfoPDB ${cmake_2_8_12_INTERFACE}
>> "${LIBPDB_ADDITIONAL_LIBRARIES}")
>>
>> Modified: llvm/trunk/lib/ExecutionEngine/Interpreter/CMakeLists.txt
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/
>> ExecutionEngine/Interpreter/CMakeLists.txt?rev=230240&r1=
>> 230239&r2=230240&view=diff
>> ============================================================
>> ==================
>> --- llvm/trunk/lib/ExecutionEngine/Interpreter/CMakeLists.txt (original)
>> +++ llvm/trunk/lib/ExecutionEngine/Interpreter/CMakeLists.txt Mon Feb 23
>> 13:15:08 2015
>> @@ -13,7 +13,7 @@ add_llvm_library(LLVMInterpreter
>>    )
>>
>>  if( LLVM_ENABLE_FFI )
>> -  target_link_libraries( LLVMInterpreter PRIVATE ${FFI_LIBRARY_PATH} )
>> +  target_link_libraries( LLVMInterpreter ${cmake_2_8_12_PRIVATE}
>> ${FFI_LIBRARY_PATH} )
>>  endif()
>>
>>  add_dependencies(LLVMInterpreter intrinsics_gen)
>>
>> Modified: llvm/trunk/tools/llvm-shlib/CMakeLists.txt
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-
>> shlib/CMakeLists.txt?rev=230240&r1=230239&r2=230240&view=diff
>> ============================================================
>> ==================
>> --- llvm/trunk/tools/llvm-shlib/CMakeLists.txt (original)
>> +++ llvm/trunk/tools/llvm-shlib/CMakeLists.txt Mon Feb 23 13:15:08 2015
>> @@ -90,7 +90,7 @@ if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linu
>>    set(LIB_NAMES -Wl,--whole-archive ${LIB_NAMES}
>> -Wl,--no-whole-archive)
>>  endif()
>>
>> -target_link_libraries(LLVM PRIVATE ${LIB_NAMES})
>> +target_link_libraries(LLVM ${cmake_2_8_12_PRIVATE} ${LIB_NAMES})
>>
>>  add_dependencies(LLVM libLLVMExports)
>>
>>
>>
>> _______________________________________________
>> llvm-commits mailing list
>> llvm-commits at cs.uiuc.edu
>> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>>
>





More information about the llvm-commits mailing list