[Lldb-commits] [lldb] r352058 - [CMake] Get back some variables used in AddLLVM.cmake

Stefan Granitz via lldb-commits lldb-commits at lists.llvm.org
Thu Jan 24 08:02:24 PST 2019


Author: stefan.graenitz
Date: Thu Jan 24 08:02:21 2019
New Revision: 352058

URL: http://llvm.org/viewvc/llvm-project?rev=352058&view=rev
Log:
[CMake] Get back some variables used in AddLLVM.cmake

This fixes 'gtest/gtest.h' file not found when building unit tests after r351863.

Modified:
    lldb/trunk/cmake/modules/LLDBStandalone.cmake

Modified: lldb/trunk/cmake/modules/LLDBStandalone.cmake
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/cmake/modules/LLDBStandalone.cmake?rev=352058&r1=352057&r2=352058&view=diff
==============================================================================
--- lldb/trunk/cmake/modules/LLDBStandalone.cmake (original)
+++ lldb/trunk/cmake/modules/LLDBStandalone.cmake Thu Jan 24 08:02:21 2019
@@ -21,7 +21,12 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURR
   # We set LLVM_CMAKE_PATH so that GetSVN.cmake is found correctly when building SVNVersion.inc
   set(LLVM_CMAKE_PATH ${LLVM_CMAKE_DIR} CACHE PATH "Path to LLVM CMake modules")
 
+  set(LLVM_MAIN_SRC_DIR ${LLVM_BUILD_MAIN_SRC_DIR} CACHE PATH "Path to LLVM source tree")
+  set(LLVM_MAIN_INCLUDE_DIR ${LLVM_BUILD_MAIN_INCLUDE_DIR} CACHE PATH "Path to llvm/include")
+  set(LLVM_LIBRARY_DIR ${LLVM_BUILD_LIBRARY_DIR} CACHE PATH "Path to llvm/lib")
+  set(LLVM_BINARY_DIR ${LLVM_BUILD_BINARY_DIR} CACHE PATH "Path to LLVM build tree")
   set(LLVM_EXTERNAL_LIT ${LLVM_TOOLS_BINARY_DIR}/llvm-lit CACHE PATH "Path to llvm-lit")
+
   find_program(LLVM_TABLEGEN_EXE "llvm-tblgen" ${LLVM_TOOLS_BINARY_DIR}
     NO_DEFAULT_PATH)
 




More information about the lldb-commits mailing list