[llvm] c970bb5 - [CMAKE] Fix 'clean' target not working

Pushpinder Singh via llvm-commits llvm-commits at lists.llvm.org
Wed Jul 29 04:34:42 PDT 2020


Author: Pushpinder Singh
Date: 2020-07-29T07:34:24-04:00
New Revision: c970bb5b34c1999c9b55af88c35620c1930a581a

URL: https://github.com/llvm/llvm-project/commit/c970bb5b34c1999c9b55af88c35620c1930a581a
DIFF: https://github.com/llvm/llvm-project/commit/c970bb5b34c1999c9b55af88c35620c1930a581a.diff

LOG: [CMAKE] Fix 'clean' target not working

cmake was still considering the empty value of ${fake_version_inc}
even if it was not defined.

Reviewed By: vsapsai

Differential Revision: https://reviews.llvm.org/D82847

Added: 
    

Modified: 
    llvm/include/llvm/Support/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/llvm/include/llvm/Support/CMakeLists.txt b/llvm/include/llvm/Support/CMakeLists.txt
index da8a4da443ed..aa71b5572181 100644
--- a/llvm/include/llvm/Support/CMakeLists.txt
+++ b/llvm/include/llvm/Support/CMakeLists.txt
@@ -16,18 +16,32 @@ if(LLVM_APPEND_VC_REV)
   endif()
 endif()
 
+set(generated_files "${version_inc}")
+if (fake_version_inc)
+  list(APPEND generated_files "${fake_version_inc}")
+endif()
+
 # Create custom target to generate the VC revision include.
-add_custom_command(OUTPUT "${version_inc}" "${fake_version_inc}"
-  DEPENDS "${llvm_vc}" "${generate_vcs_version_script}"
-  COMMAND ${CMAKE_COMMAND} "-DNAMES=LLVM"
-                           "-DLLVM_SOURCE_DIR=${llvm_source_dir}"
-                           "-DHEADER_FILE=${version_inc}"
-                           -P "${generate_vcs_version_script}")
+if (fake_version_inc)
+  add_custom_command(OUTPUT "${version_inc}" "${fake_version_inc}"
+    DEPENDS "${llvm_vc}" "${generate_vcs_version_script}"
+    COMMAND ${CMAKE_COMMAND} "-DNAMES=LLVM"
+                             "-DLLVM_SOURCE_DIR=${llvm_source_dir}"
+                             "-DHEADER_FILE=${version_inc}"
+                             -P "${generate_vcs_version_script}")
+else()
+  add_custom_command(OUTPUT "${version_inc}"
+    DEPENDS "${llvm_vc}" "${generate_vcs_version_script}"
+    COMMAND ${CMAKE_COMMAND} "-DNAMES=LLVM"
+                             "-DLLVM_SOURCE_DIR=${llvm_source_dir}"
+                             "-DHEADER_FILE=${version_inc}"
+                             -P "${generate_vcs_version_script}")
+endif()
 
 # Mark the generated header as being generated.
 set_source_files_properties("${version_inc}"
   PROPERTIES GENERATED TRUE
              HEADER_FILE_ONLY TRUE)
 
-add_custom_target(llvm_vcsrevision_h ALL DEPENDS "${version_inc}" "${fake_version_inc}")
+add_custom_target(llvm_vcsrevision_h ALL DEPENDS "${generated_files}")
 set_target_properties(llvm_vcsrevision_h PROPERTIES FOLDER "Misc")


        


More information about the llvm-commits mailing list