This revision was automatically updated to reflect the committed changes. Closed by commit rL354417: CMake: Fix stand-alone clang builds since r353268 (authored by tstellar, committed by ).
Changed prior to commit: https://reviews.llvm.org/D58204?vs=186769&id=187473#toc Repository: rL LLVM CHANGES SINCE LAST ACTION https://reviews.llvm.org/D58204/new/ https://reviews.llvm.org/D58204 Files: cfe/trunk/CMakeLists.txt llvm/trunk/cmake/modules/AddLLVM.cmake Index: llvm/trunk/cmake/modules/AddLLVM.cmake =================================================================== --- llvm/trunk/cmake/modules/AddLLVM.cmake +++ llvm/trunk/cmake/modules/AddLLVM.cmake @@ -1718,6 +1718,9 @@ endfunction() function(find_first_existing_vc_file path out_var) + if(NOT EXISTS "${path}") + return() + endif() if(EXISTS "${path}/.svn") set(svn_files "${path}/.svn/wc.db" # SVN 1.7 Index: cfe/trunk/CMakeLists.txt =================================================================== --- cfe/trunk/CMakeLists.txt +++ cfe/trunk/CMakeLists.txt @@ -75,6 +75,11 @@ set(LIBRARY_DIR ${LLVM_LIBRARY_DIR}) set(INCLUDE_DIR ${LLVM_INCLUDE_DIR}) set(LLVM_OBJ_DIR ${LLVM_BINARY_DIR}) + # The LLVM_CMAKE_PATH variable is set when doing non-standalone builds and + # used in this project, so we need to make sure we set this value. + # FIXME: LLVM_CMAKE_DIR comes from LLVMConfig.cmake. We should rename + # LLVM_CMAKE_PATH to LLVM_CMAKE_DIR throughout the project. + set(LLVM_CMAKE_PATH ${LLVM_CMAKE_DIR}) endif() set(LLVM_TOOLS_BINARY_DIR ${TOOLS_BINARY_DIR} CACHE PATH "Path to llvm/bin")
Index: llvm/trunk/cmake/modules/AddLLVM.cmake =================================================================== --- llvm/trunk/cmake/modules/AddLLVM.cmake +++ llvm/trunk/cmake/modules/AddLLVM.cmake @@ -1718,6 +1718,9 @@ endfunction() function(find_first_existing_vc_file path out_var) + if(NOT EXISTS "${path}") + return() + endif() if(EXISTS "${path}/.svn") set(svn_files "${path}/.svn/wc.db" # SVN 1.7 Index: cfe/trunk/CMakeLists.txt =================================================================== --- cfe/trunk/CMakeLists.txt +++ cfe/trunk/CMakeLists.txt @@ -75,6 +75,11 @@ set(LIBRARY_DIR ${LLVM_LIBRARY_DIR}) set(INCLUDE_DIR ${LLVM_INCLUDE_DIR}) set(LLVM_OBJ_DIR ${LLVM_BINARY_DIR}) + # The LLVM_CMAKE_PATH variable is set when doing non-standalone builds and + # used in this project, so we need to make sure we set this value. + # FIXME: LLVM_CMAKE_DIR comes from LLVMConfig.cmake. We should rename + # LLVM_CMAKE_PATH to LLVM_CMAKE_DIR throughout the project. + set(LLVM_CMAKE_PATH ${LLVM_CMAKE_DIR}) endif() set(LLVM_TOOLS_BINARY_DIR ${TOOLS_BINARY_DIR} CACHE PATH "Path to llvm/bin")
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits