mgorny created this revision.
mgorny added reviewers: labath, JDevlieghere, MaskRay, tstellar.
Herald added a subscriber: StephenFan.
Herald added a project: All.
mgorny requested review of this revision.
Move include_directories() declaration before gtest targets are created
in standalone build. This fixes build failure due to gtest targets
being unable to find LLVM headers, e.g.:
/var/tmp/portage/dev-util/lldb-16.0.0_pre20221023/work/llvm/utils/unittest/googletest/include/gtest/internal/custom/raw-ostream.h:43:10:
fatal error: llvm/ADT/Optional.h: No such file or directory
https://reviews.llvm.org/D136552
Files:
lldb/cmake/modules/LLDBStandalone.cmake
Index: lldb/cmake/modules/LLDBStandalone.cmake
===================================================================
--- lldb/cmake/modules/LLDBStandalone.cmake
+++ lldb/cmake/modules/LLDBStandalone.cmake
@@ -97,6 +97,12 @@
set(PACKAGE_VERSION "${LLVM_PACKAGE_VERSION}")
set(LLVM_INCLUDE_TESTS ON CACHE INTERNAL "")
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+include_directories(
+ "${CMAKE_BINARY_DIR}/include"
+ "${LLVM_INCLUDE_DIRS}"
+ "${CLANG_INCLUDE_DIRS}")
+
if(LLDB_INCLUDE_TESTS)
# Build the gtest library needed for unittests, if we have LLVM sources
# handy.
@@ -119,12 +125,6 @@
set_target_properties(clang-tablegen-targets PROPERTIES FOLDER "lldb misc")
set_target_properties(intrinsics_gen PROPERTIES FOLDER "lldb misc")
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-include_directories(
- "${CMAKE_BINARY_DIR}/include"
- "${LLVM_INCLUDE_DIRS}"
- "${CLANG_INCLUDE_DIRS}")
-
if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS)
set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake)
endif()
Index: lldb/cmake/modules/LLDBStandalone.cmake
===================================================================
--- lldb/cmake/modules/LLDBStandalone.cmake
+++ lldb/cmake/modules/LLDBStandalone.cmake
@@ -97,6 +97,12 @@
set(PACKAGE_VERSION "${LLVM_PACKAGE_VERSION}")
set(LLVM_INCLUDE_TESTS ON CACHE INTERNAL "")
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+include_directories(
+ "${CMAKE_BINARY_DIR}/include"
+ "${LLVM_INCLUDE_DIRS}"
+ "${CLANG_INCLUDE_DIRS}")
+
if(LLDB_INCLUDE_TESTS)
# Build the gtest library needed for unittests, if we have LLVM sources
# handy.
@@ -119,12 +125,6 @@
set_target_properties(clang-tablegen-targets PROPERTIES FOLDER "lldb misc")
set_target_properties(intrinsics_gen PROPERTIES FOLDER "lldb misc")
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-include_directories(
- "${CMAKE_BINARY_DIR}/include"
- "${LLVM_INCLUDE_DIRS}"
- "${CLANG_INCLUDE_DIRS}")
-
if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS)
set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake)
endif()
_______________________________________________
lldb-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
