<p dir="ltr">Is it really unreasonable to upgrade the bot instead? </p>
<div class="gmail_quote">On Feb 24, 2015 11:44 AM, "Tobias Grosser" <<a href="mailto:tobias@grosser.es">tobias@grosser.es</a>> wrote:<br type="attribution"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: grosser<br>
Date: Tue Feb 24 10:39:46 2015<br>
New Revision: 230343<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=230343&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=230343&view=rev</a><br>
Log:<br>
Revert "Raising minimum required CMake version to 2.8.12.2."<br>
<br>
This reverts commit r230062.<br>
<br>
Debian stable (wheezy) ships still with cmake 2.8.9.<br>
<br>
The commit broke my LLVM/Polly buildbot, to my knowledge our only Linux+cmake<br>
buildbot.<br>
<br>
Modified:<br>
llvm/trunk/CMakeLists.txt<br>
llvm/trunk/cmake/modules/LLVM-Config.cmake<br>
llvm/trunk/lib/DebugInfo/PDB/CMakeLists.txt<br>
llvm/trunk/lib/ExecutionEngine/Interpreter/CMakeLists.txt<br>
llvm/trunk/tools/llvm-shlib/CMakeLists.txt<br>
<br>
Modified: llvm/trunk/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/CMakeLists.txt?rev=230343&r1=230342&r2=230343&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/CMakeLists.txt?rev=230343&r1=230342&r2=230343&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/CMakeLists.txt (original)<br>
+++ llvm/trunk/CMakeLists.txt Tue Feb 24 10:39:46 2015<br>
@@ -1,14 +1,24 @@<br>
# See docs/CMake.html for instructions about how to build LLVM with CMake.<br>
<br>
-cmake_minimum_required(VERSION 2.8.12.2)<br>
+cmake_minimum_required(VERSION 2.8.8)<br>
<br>
if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)<br>
message(STATUS "No build type selected, default to Debug")<br>
set(CMAKE_BUILD_TYPE "Debug")<br>
endif()<br>
<br>
-if(POLICY CMP0022)<br>
- cmake_policy(SET CMP0022 NEW) # automatic when 2.8.12 is required<br>
+# FIXME: It may be removed when we use 2.8.12.<br>
+if(CMAKE_VERSION VERSION_LESS 2.8.12)<br>
+ # Invalidate a couple of keywords.<br>
+ set(cmake_2_8_12_INTERFACE)<br>
+ set(cmake_2_8_12_PRIVATE)<br>
+else()<br>
+ # Use ${cmake_2_8_12_KEYWORD} intead of KEYWORD in target_link_libraries().<br>
+ set(cmake_2_8_12_INTERFACE INTERFACE)<br>
+ set(cmake_2_8_12_PRIVATE PRIVATE)<br>
+ if(POLICY CMP0022)<br>
+ cmake_policy(SET CMP0022 NEW) # automatic when 2.8.12 is required<br>
+ endif()<br>
endif()<br>
<br>
if(CMAKE_VERSION VERSION_LESS 3.1.20141117)<br>
<br>
Modified: llvm/trunk/cmake/modules/LLVM-Config.cmake<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/LLVM-Config.cmake?rev=230343&r1=230342&r2=230343&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/LLVM-Config.cmake?rev=230343&r1=230342&r2=230343&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/cmake/modules/LLVM-Config.cmake (original)<br>
+++ llvm/trunk/cmake/modules/LLVM-Config.cmake Tue Feb 24 10:39:46 2015<br>
@@ -41,9 +41,9 @@ function(explicit_llvm_config executable<br>
llvm_map_components_to_libnames(LIBRARIES ${link_components})<br>
get_target_property(t ${executable} TYPE)<br>
if("x${t}" STREQUAL "xSTATIC_LIBRARY")<br>
- target_link_libraries(${executable} INTERFACE ${LIBRARIES})<br>
+ target_link_libraries(${executable} ${cmake_2_8_12_INTERFACE} ${LIBRARIES})<br>
elseif("x${t}" STREQUAL "xSHARED_LIBRARY" OR "x${t}" STREQUAL "xMODULE_LIBRARY")<br>
- target_link_libraries(${executable} PRIVATE ${LIBRARIES})<br>
+ target_link_libraries(${executable} ${cmake_2_8_12_PRIVATE} ${LIBRARIES})<br>
else()<br>
# Use plain form for legacy user.<br>
target_link_libraries(${executable} ${LIBRARIES})<br>
<br>
Modified: llvm/trunk/lib/DebugInfo/PDB/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/PDB/CMakeLists.txt?rev=230343&r1=230342&r2=230343&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/PDB/CMakeLists.txt?rev=230343&r1=230342&r2=230343&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/DebugInfo/PDB/CMakeLists.txt (original)<br>
+++ llvm/trunk/lib/DebugInfo/PDB/CMakeLists.txt Tue Feb 24 10:39:46 2015<br>
@@ -73,4 +73,4 @@ add_llvm_library(LLVMDebugInfoPDB<br>
${LIBPDB_ADDITIONAL_HEADER_DIRS}<br>
)<br>
<br>
-target_link_libraries(LLVMDebugInfoPDB INTERFACE "${LIBPDB_ADDITIONAL_LIBRARIES}")<br>
+target_link_libraries(LLVMDebugInfoPDB ${cmake_2_8_12_INTERFACE} "${LIBPDB_ADDITIONAL_LIBRARIES}")<br>
<br>
Modified: llvm/trunk/lib/ExecutionEngine/Interpreter/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/Interpreter/CMakeLists.txt?rev=230343&r1=230342&r2=230343&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/Interpreter/CMakeLists.txt?rev=230343&r1=230342&r2=230343&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/ExecutionEngine/Interpreter/CMakeLists.txt (original)<br>
+++ llvm/trunk/lib/ExecutionEngine/Interpreter/CMakeLists.txt Tue Feb 24 10:39:46 2015<br>
@@ -13,7 +13,7 @@ add_llvm_library(LLVMInterpreter<br>
)<br>
<br>
if( LLVM_ENABLE_FFI )<br>
- target_link_libraries( LLVMInterpreter PRIVATE ${FFI_LIBRARY_PATH} )<br>
+ target_link_libraries( LLVMInterpreter ${cmake_2_8_12_PRIVATE} ${FFI_LIBRARY_PATH} )<br>
endif()<br>
<br>
add_dependencies(LLVMInterpreter intrinsics_gen)<br>
<br>
Modified: llvm/trunk/tools/llvm-shlib/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-shlib/CMakeLists.txt?rev=230343&r1=230342&r2=230343&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-shlib/CMakeLists.txt?rev=230343&r1=230342&r2=230343&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/tools/llvm-shlib/CMakeLists.txt (original)<br>
+++ llvm/trunk/tools/llvm-shlib/CMakeLists.txt Tue Feb 24 10:39:46 2015<br>
@@ -90,7 +90,7 @@ if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linu<br>
set(LIB_NAMES -Wl,--whole-archive ${LIB_NAMES} -Wl,--no-whole-archive)<br>
endif()<br>
<br>
-target_link_libraries(LLVM PRIVATE ${LIB_NAMES})<br>
+target_link_libraries(LLVM ${cmake_2_8_12_PRIVATE} ${LIB_NAMES})<br>
<br>
add_dependencies(LLVM libLLVMExports)<br>
<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div>