|
 |
917bd23 |
From 3b2afecc227d652f84f883d4018d43971de6a311 Mon Sep 17 00:00:00 2001
|
|
|
917bd23 |
From: Tom Stellard <tstellar@redhat.com>
|
|
|
917bd23 |
Date: Wed, 21 Mar 2018 07:17:00 -0700
|
|
|
917bd23 |
Subject: [PATCH] gtest reorg
|
|
|
917bd23 |
|
|
|
917bd23 |
---
|
|
|
917bd23 |
CMakeLists.txt | 12 +++++-------
|
|
|
917bd23 |
1 file changed, 5 insertions(+), 7 deletions(-)
|
|
|
917bd23 |
|
|
|
917bd23 |
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
|
917bd23 |
index 2eee8e6..01d290f 100644
|
|
|
917bd23 |
--- a/CMakeLists.txt
|
|
|
917bd23 |
+++ b/CMakeLists.txt
|
|
|
917bd23 |
@@ -142,12 +142,6 @@ Please install Python or specify the PYTHON_EXECUTABLE CMake variable.")
|
|
|
917bd23 |
set(LLVM_UTILS_PROVIDED ON)
|
|
|
917bd23 |
set(CLANG_TEST_DEPS FileCheck count not)
|
|
|
917bd23 |
endif()
|
|
|
917bd23 |
- set(UNITTEST_DIR ${LLVM_MAIN_SRC_DIR}/utils/unittest)
|
|
|
917bd23 |
- if(EXISTS ${UNITTEST_DIR}/googletest/include/gtest/gtest.h
|
|
|
917bd23 |
- AND NOT EXISTS ${LLVM_LIBRARY_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX}
|
|
|
917bd23 |
- AND EXISTS ${UNITTEST_DIR}/CMakeLists.txt)
|
|
|
917bd23 |
- add_subdirectory(${UNITTEST_DIR} utils/unittest)
|
|
|
917bd23 |
- endif()
|
|
|
917bd23 |
else()
|
|
|
917bd23 |
# Seek installed Lit.
|
|
|
917bd23 |
find_program(LLVM_LIT
|
|
|
917bd23 |
@@ -477,7 +471,11 @@ endif()
|
|
|
917bd23 |
|
|
|
917bd23 |
|
|
|
917bd23 |
if( CLANG_INCLUDE_TESTS )
|
|
|
917bd23 |
- if(EXISTS ${LLVM_MAIN_SRC_DIR}/utils/unittest/googletest/include/gtest/gtest.h)
|
|
|
917bd23 |
+ set(UNITTEST_DIR ${LLVM_MAIN_SRC_DIR}/utils/unittest)
|
|
|
917bd23 |
+ if(EXISTS ${UNITTEST_DIR}/googletest/include/gtest/gtest.h
|
|
|
917bd23 |
+ AND NOT EXISTS ${LLVM_LIBRARY_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX}
|
|
|
917bd23 |
+ AND EXISTS ${UNITTEST_DIR}/CMakeLists.txt)
|
|
|
917bd23 |
+ add_subdirectory(${UNITTEST_DIR} utils/unittest)
|
|
|
917bd23 |
add_subdirectory(unittests)
|
|
|
917bd23 |
list(APPEND CLANG_TEST_DEPS ClangUnitTests)
|
|
|
917bd23 |
list(APPEND CLANG_TEST_PARAMS
|
|
|
917bd23 |
--
|
|
|
917bd23 |
1.8.3.1
|
|
|
917bd23 |
|