<div dir="ltr">Two things:<br><br>a) Explain why please.<div>b) No git hashes in your revert messages, please use the svn revision.</div><div><br></div><div>Thanks!</div><div><br></div><div>-eric</div></div><br><div class="gmail_quote">On Mon Feb 23 2015 at 11:25:31 AM Chad Rosier <<a href="mailto:mcrosier@codeaurora.org">mcrosier@codeaurora.org</a>> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: mcrosier<br>
Date: Mon Feb 23 13:15:08 2015<br>
New Revision: 230240<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=230240&view=rev" target="_blank">http://llvm.org/viewvc/llvm-<u></u>project?rev=230240&view=rev</a><br>
Log:<br>
Revert "Raising minimum required CMake version to 2.8.12.2."<br>
<br>
This reverts commit 247aed4710e8befde76da42b273136<u></u>61dea7cf66.<br>
<br>
Modified:<br>
llvm/trunk/CMakeLists.txt<br>
llvm/trunk/cmake/modules/LLVM-<u></u>Config.cmake<br>
llvm/trunk/lib/DebugInfo/PDB/<u></u>CMakeLists.txt<br>
llvm/trunk/lib/<u></u>ExecutionEngine/Interpreter/<u></u>CMakeLists.txt<br>
llvm/trunk/tools/llvm-shlib/<u></u>CMakeLists.txt<br>
<br>
Modified: llvm/trunk/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/CMakeLists.txt?rev=230240&r1=230239&r2=230240&view=diff" target="_blank">http://llvm.org/viewvc/llvm-<u></u>project/llvm/trunk/CMakeLists.<u></u>txt?rev=230240&r1=230239&r2=<u></u>230240&view=diff</a><br>
==============================<u></u>==============================<u></u>==================<br>
--- llvm/trunk/CMakeLists.txt (original)<br>
+++ llvm/trunk/CMakeLists.txt Mon Feb 23 13:15:08 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(<u></u>VERSION 2.8.12.2)<br>
+cmake_minimum_required(<u></u>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-<u></u>Config.cmake<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/LLVM-Config.cmake?rev=230240&r1=230239&r2=230240&view=diff" target="_blank">http://llvm.org/viewvc/llvm-<u></u>project/llvm/trunk/cmake/<u></u>modules/LLVM-Config.cmake?rev=<u></u>230240&r1=230239&r2=230240&<u></u>view=diff</a><br>
==============================<u></u>==============================<u></u>==================<br>
--- llvm/trunk/cmake/modules/LLVM-<u></u>Config.cmake (original)<br>
+++ llvm/trunk/cmake/modules/LLVM-<u></u>Config.cmake Mon Feb 23 13:15:08 2015<br>
@@ -41,9 +41,9 @@ function(explicit_llvm_config executable<br>
llvm_map_components_to_<u></u>libnames(LIBRARIES ${link_components})<br>
get_target_property(t ${executable} TYPE)<br>
if("x${t}" STREQUAL "xSTATIC_LIBRARY")<br>
- target_link_libraries(${<u></u>executable} INTERFACE ${LIBRARIES})<br>
+ target_link_libraries(${<u></u>executable} ${cmake_2_8_12_INTERFACE} ${LIBRARIES})<br>
elseif("x${t}" STREQUAL "xSHARED_LIBRARY" OR "x${t}" STREQUAL "xMODULE_LIBRARY")<br>
- target_link_libraries(${<u></u>executable} PRIVATE ${LIBRARIES})<br>
+ target_link_libraries(${<u></u>executable} ${cmake_2_8_12_PRIVATE} ${LIBRARIES})<br>
else()<br>
# Use plain form for legacy user.<br>
target_link_libraries(${<u></u>executable} ${LIBRARIES})<br>
<br>
Modified: llvm/trunk/lib/DebugInfo/PDB/<u></u>CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/PDB/CMakeLists.txt?rev=230240&r1=230239&r2=230240&view=diff" target="_blank">http://llvm.org/viewvc/llvm-<u></u>project/llvm/trunk/lib/<u></u>DebugInfo/PDB/CMakeLists.txt?<u></u>rev=230240&r1=230239&r2=<u></u>230240&view=diff</a><br>
==============================<u></u>==============================<u></u>==================<br>
--- llvm/trunk/lib/DebugInfo/PDB/<u></u>CMakeLists.txt (original)<br>
+++ llvm/trunk/lib/DebugInfo/PDB/<u></u>CMakeLists.txt Mon Feb 23 13:15:08 2015<br>
@@ -73,4 +73,4 @@ add_llvm_library(<u></u>LLVMDebugInfoPDB<br>
${LIBPDB_ADDITIONAL_HEADER_<u></u>DIRS}<br>
)<br>
<br>
-target_link_libraries(<u></u>LLVMDebugInfoPDB INTERFACE "${LIBPDB_ADDITIONAL_<u></u>LIBRARIES}")<br>
+target_link_libraries(<u></u>LLVMDebugInfoPDB ${cmake_2_8_12_INTERFACE} "${LIBPDB_ADDITIONAL_<u></u>LIBRARIES}")<br>
<br>
Modified: llvm/trunk/lib/<u></u>ExecutionEngine/Interpreter/<u></u>CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/Interpreter/CMakeLists.txt?rev=230240&r1=230239&r2=230240&view=diff" target="_blank">http://llvm.org/viewvc/llvm-<u></u>project/llvm/trunk/lib/<u></u>ExecutionEngine/Interpreter/<u></u>CMakeLists.txt?rev=230240&r1=<u></u>230239&r2=230240&view=diff</a><br>
==============================<u></u>==============================<u></u>==================<br>
--- llvm/trunk/lib/<u></u>ExecutionEngine/Interpreter/<u></u>CMakeLists.txt (original)<br>
+++ llvm/trunk/lib/<u></u>ExecutionEngine/Interpreter/<u></u>CMakeLists.txt Mon Feb 23 13:15:08 2015<br>
@@ -13,7 +13,7 @@ add_llvm_library(<u></u>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(<u></u>LLVMInterpreter intrinsics_gen)<br>
<br>
Modified: llvm/trunk/tools/llvm-shlib/<u></u>CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-shlib/CMakeLists.txt?rev=230240&r1=230239&r2=230240&view=diff" target="_blank">http://llvm.org/viewvc/llvm-<u></u>project/llvm/trunk/tools/llvm-<u></u>shlib/CMakeLists.txt?rev=<u></u>230240&r1=230239&r2=230240&<u></u>view=diff</a><br>
==============================<u></u>==============================<u></u>==================<br>
--- llvm/trunk/tools/llvm-shlib/<u></u>CMakeLists.txt (original)<br>
+++ llvm/trunk/tools/llvm-shlib/<u></u>CMakeLists.txt Mon Feb 23 13:15:08 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>
______________________________<u></u>_________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu" target="_blank">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/<u></u>mailman/listinfo/llvm-commits</a><br>
</blockquote></div>