[Lldb-commits] [PATCH] Fix the search path for CMake files

[Niels Ole Salscheider via lldb-commits]

On Thursday, 4 February 2016, 23:02:13 CET, Zachary Turner wrote:
> Seems fine.  Does this only affect the LLDB Standalone build?  I don't know
> if any of the main contributors test that, but if you test it and it works
> for you then I guess this is ok.

Yes, this is only relevant for the standalone build.

> On Thu, Feb 4, 2016 at 2:52 PM Niels Ole Salscheider via lldb-commits <
> 
> lldb-commits at lists.llvm.org> wrote:
> > This allows to find the LLVM's CMake files after moving them in
> > r259821.
> > ---
> > 
> >  cmake/modules/LLDBStandalone.cmake | 8 ++++----
> >  1 file changed, 4 insertions(+), 4 deletions(-)
> > 
> > diff --git a/cmake/modules/LLDBStandalone.cmake
> > b/cmake/modules/LLDBStandalone.cmake
> > index d3955f1..4fa5ca9 100644
> > --- a/cmake/modules/LLDBStandalone.cmake
> > +++ b/cmake/modules/LLDBStandalone.cmake
> > @@ -34,7 +34,7 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
> > 
> >        set(CLANG_MAIN_INCLUDE_DIR "${CLANG_MAIN_SRC_DIR}/include")
> >    
> >    endif()
> > 
> > -  list(APPEND CMAKE_MODULE_PATH
> > "${LLDB_PATH_TO_LLVM_BUILD}/share/llvm/cmake")
> > +  list(APPEND CMAKE_MODULE_PATH
> > "${LLDB_PATH_TO_LLVM_BUILD}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm")
> > 
> >    if (LLDB_PATH_TO_LLVM_BUILD)
> >    
> >      get_filename_component(PATH_TO_LLVM_BUILD ${LLDB_PATH_TO_LLVM_BUILD}
> > 
> > @@ -73,9 +73,9 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
> > 
> >      message("-- Found PythonInterp: ${PYTHON_EXECUTABLE}")
> >    
> >    endif()
> >    # Import CMake library targets from LLVM and Clang.
> > 
> > -  include("${LLDB_PATH_TO_LLVM_BUILD}/share/llvm/cmake/LLVMConfig.cmake")
> > -  if (EXISTS
> > "${LLDB_PATH_TO_CLANG_BUILD}/share/clang/cmake/ClangConfig.cmake")
> > -
> > include("${LLDB_PATH_TO_CLANG_BUILD}/share/clang/cmake/ClangConfig.cmake")
> > +
> > include("${LLDB_PATH_TO_LLVM_BUILD}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm/LL
> > VMConfig.cmake") +  if (EXISTS
> > "${LLDB_PATH_TO_CLANG_BUILD}/lib${LLVM_LIBDIR_SUFFIX}/cmake/clang/ClangCon
> > fig.cmake") +
> > include("${LLDB_PATH_TO_CLANG_BUILD}/lib${LLVM_LIBDIR_SUFFIX}/cmake/clang/
> > ClangConfig.cmake")> 
> >    endif()
> >    
> >    set(PACKAGE_VERSION "${LLVM_PACKAGE_VERSION}")
> > 
> > --
> > 2.7.0
> > 
> > _______________________________________________
> > lldb-commits mailing list
> > lldb-commits at lists.llvm.org
> > http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits