Fix CMake configuration for MLIR unittests

The CMake changes in 2aa1af9b1da to make it possible to build MLIR as a
standalone project unfortunately disabled all unit-tests from the
regular in-tree build.

diff --git a/mlir/CMakeLists.txt b/mlir/CMakeLists.txt
index 91ad37f..dc03756 100644 (file)
--- a/mlir/CMakeLists.txt
+++ b/mlir/CMakeLists.txt
@@ -133,6 +133,7 @@ add_subdirectory(lib)
 add_subdirectory(lib/CAPI)
 if (MLIR_INCLUDE_TESTS)
   add_definitions(-DMLIR_INCLUDE_TESTS)
+  add_custom_target(MLIRUnitTests)
   if (EXISTS ${LLVM_MAIN_SRC_DIR}/utils/unittest/googletest/include/gtest/gtest.h)
     add_subdirectory(unittests)
   else()

diff --git a/mlir/test/CMakeLists.txt b/mlir/test/CMakeLists.txt
index 999201e..9a45b29 100644 (file)
--- a/mlir/test/CMakeLists.txt
+++ b/mlir/test/CMakeLists.txt
@@ -57,9 +57,7 @@ set(MLIR_TEST_DEPENDS
   mlir_async_runtime
   )
 
-if(TARGET gtest)
-  list(APPEND MLIR_TEST_DEPENDS MLIRUnitTests)
-endif()
+list(APPEND MLIR_TEST_DEPENDS MLIRUnitTests)
 
 if(LLVM_BUILD_EXAMPLES)
   list(APPEND MLIR_TEST_DEPENDS

diff --git a/mlir/unittests/CMakeLists.txt b/mlir/unittests/CMakeLists.txt
index d8d52fc..0e086ff 100644 (file)
--- a/mlir/unittests/CMakeLists.txt
+++ b/mlir/unittests/CMakeLists.txt
@@ -1,4 +1,3 @@
-add_custom_target(MLIRUnitTests)
 set_target_properties(MLIRUnitTests PROPERTIES FOLDER "MLIR Tests")
 
 function(add_mlir_unittest test_dirname)