[cmake] Change deprecated $<CONFIG> to $<CONFIGURATION>. NFC
authorFangrui Song <maskray@google.com>
Sat, 30 Mar 2019 14:38:51 +0000 (14:38 +0000)
committerFangrui Song <maskray@google.com>
Sat, 30 Mar 2019 14:38:51 +0000 (14:38 +0000)
See rL357338 for a similar change. The informational expression
$<CONFIGURATION> has been deprecated since CMake 3.0

llvm-svn: 357348

clang/runtime/CMakeLists.txt
compiler-rt/cmake/Modules/AddCompilerRT.cmake
llvm/tools/llvm-config/CMakeLists.txt

index 0bb0a0a..e1e52b0 100644 (file)
@@ -18,7 +18,7 @@ function(get_ext_project_build_command out_var target)
     set(${out_var} "$(MAKE)" "${target}" PARENT_SCOPE)
   else()
     set(${out_var} ${CMAKE_COMMAND} --build . --target ${target}
-                                    --config $<CONFIGURATION> PARENT_SCOPE)
+                                    --config $<CONFIG> PARENT_SCOPE)
   endif()
 endfunction()
 
index d91c24f..bed0826 100644 (file)
@@ -615,7 +615,7 @@ macro(add_custom_libcxx name prefix)
     set(run_clean "$(MAKE)" "-C" "${BINARY_DIR}" "clean")
   else()
     set(run_clean ${CMAKE_COMMAND} --build ${BINARY_DIR} --target clean
-                                   --config "$<CONFIGURATION>")
+                                   --config "$<CONFIG>")
   endif()
 
   ExternalProject_Add_Step(${name} clean
index fc3dbaa..7788228 100644 (file)
@@ -78,7 +78,7 @@ if(CMAKE_CROSSCOMPILING AND NOT LLVM_CONFIG_PATH)
   set(LLVM_CONFIG_PATH "${LLVM_NATIVE_BUILD}/bin/llvm-config" CACHE STRING "")
 
   add_custom_command(OUTPUT "${LLVM_CONFIG_PATH}"
-    COMMAND ${CMAKE_COMMAND} --build . --target llvm-config --config $<CONFIGURATION>
+    COMMAND ${CMAKE_COMMAND} --build . --target llvm-config --config $<CONFIG>
     DEPENDS ${LLVM_NATIVE_BUILD}/CMakeCache.txt
     WORKING_DIRECTORY ${LLVM_NATIVE_BUILD}
     COMMENT "Building native llvm-config..."