From b041a3628d25b98fc05145a077c75a53a994f36d Mon Sep 17 00:00:00 2001 From: Michal Gorny Date: Mon, 11 Feb 2019 09:07:07 +0000 Subject: [PATCH] [llvm] [cmake] Use current directory in GenerateVersionFromVCS Find dependent scripts of GenerateVersionFromVCS in current directory rather than ../../cmake/modules. I do not see any reason why the former would not work and The latter is incorrect when GenerateVersionFromVCS is used from install directory (i.e. in stand-alone builds). Differential Revision: https://reviews.llvm.org/D57996 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@353674 91177308-0d34-0410-b5e6-96231b3b80d8 --- cmake/modules/GenerateVersionFromVCS.cmake | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/cmake/modules/GenerateVersionFromVCS.cmake b/cmake/modules/GenerateVersionFromVCS.cmake index a38480c640f..d8ec54df41e 100644 --- a/cmake/modules/GenerateVersionFromVCS.cmake +++ b/cmake/modules/GenerateVersionFromVCS.cmake @@ -9,11 +9,9 @@ # where "" is substituted with the names specified in the input variables, # for each of the _SOURCE_DIR given. -get_filename_component(LLVM_DIR "${CMAKE_SCRIPT_MODE_FILE}" PATH) -get_filename_component(LLVM_DIR "${LLVM_DIR}" PATH) -get_filename_component(LLVM_DIR "${LLVM_DIR}" PATH) +get_filename_component(LLVM_CMAKE_DIR "${CMAKE_SCRIPT_MODE_FILE}" PATH) -list(APPEND CMAKE_MODULE_PATH "${LLVM_DIR}/cmake/modules") +list(APPEND CMAKE_MODULE_PATH "${LLVM_CMAKE_DIR}") include(VersionFromVCS) -- 2.11.0