[llvm] cad1cbc - [CMake] Provide a proper default location for llvm-lit for out-of-tree users on Windows host.

Vladimir Vereschaka via llvm-commits llvm-commits at lists.llvm.org
Fri May 1 11:48:48 PDT 2020


Author: Vladimir Vereschaka
Date: 2020-05-01T11:48:30-07:00
New Revision: cad1cbc4bcf83a93b7be3df7c97f20f76f405b9e

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

LOG: [CMake] Provide a proper default location for llvm-lit for out-of-tree users on Windows host.

llvm-lit gets '.py' extension on Windows host during its configuration.
We need to provide a correct name for llvm-lit including file extension
within LLVM_CONFIG_DEFAULT_EXTERNAL_LIT variable.

Update for commit 45526d29a5b2cf126b83ada3991921970007d16f.

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

Added: 
    

Modified: 
    llvm/cmake/modules/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/llvm/cmake/modules/CMakeLists.txt b/llvm/cmake/modules/CMakeLists.txt
index 4bb03b63122b..1cef87a5e18d 100644
--- a/llvm/cmake/modules/CMakeLists.txt
+++ b/llvm/cmake/modules/CMakeLists.txt
@@ -56,7 +56,11 @@ set(LLVM_CONFIG_TOOLS_BINARY_DIR "${LLVM_TOOLS_BINARY_DIR}")
 
 # Generate a default location for lit
 if (LLVM_BUILD_UTILS)
-  set(LLVM_CONFIG_DEFAULT_EXTERNAL_LIT "${LLVM_CONFIG_TOOLS_BINARY_DIR}/llvm-lit")
+  if (CMAKE_HOST_WIN32 AND NOT CYGWIN)
+    set(LLVM_CONFIG_DEFAULT_EXTERNAL_LIT "${LLVM_CONFIG_TOOLS_BINARY_DIR}/llvm-lit.py")
+  else()
+    set(LLVM_CONFIG_DEFAULT_EXTERNAL_LIT "${LLVM_CONFIG_TOOLS_BINARY_DIR}/llvm-lit")
+  endif()
 endif()
 
 if (LLVM_LINK_LLVM_DYLIB)


        


More information about the llvm-commits mailing list