[PATCH] D38839: [compiler-rt] [cmake] [interception] Remove duplicate gtest from test COMPILE_DEPS

[Michał Górny via Phabricator via cfe-commits]

mgorny created this revision.
Herald added a subscriber: dberris.

Fix the gtest dependency to be included in DEPS only, rather than
in COMPILE_DEPS + DEPS. The former variable is apparently used to
provide unconditional dependencies, while the latter are only used
for non-standalone builds. Since they are concatenated, specifying gtest
in both is redundant. Furthermore, including it in COMPILE_DEPS causes
build failure for standalone builds where 'gtest' target is not present.


https://reviews.llvm.org/D38839

Files:
  lib/interception/tests/CMakeLists.txt


Index: lib/interception/tests/CMakeLists.txt
===================================================================
--- lib/interception/tests/CMakeLists.txt
+++ lib/interception/tests/CMakeLists.txt
@@ -89,7 +89,7 @@
     InterceptionUnitTests "Interception-${arch}-Test" ${arch}
     RUNTIME ${INTERCEPTION_COMMON_LIB}
     SOURCES ${INTERCEPTION_UNITTESTS} ${COMPILER_RT_GTEST_SOURCE}
-    COMPILE_DEPS gtest ${INTERCEPTION_TEST_HEADERS}
+    COMPILE_DEPS ${INTERCEPTION_TEST_HEADERS}
     DEPS gtest
     CFLAGS ${INTERCEPTION_TEST_CFLAGS_COMMON}
     LINK_FLAGS ${INTERCEPTION_TEST_LINK_FLAGS_COMMON})



Index: lib/interception/tests/CMakeLists.txt
===================================================================
--- lib/interception/tests/CMakeLists.txt
+++ lib/interception/tests/CMakeLists.txt
@@ -89,7 +89,7 @@
     InterceptionUnitTests "Interception-${arch}-Test" ${arch}
     RUNTIME ${INTERCEPTION_COMMON_LIB}
     SOURCES ${INTERCEPTION_UNITTESTS} ${COMPILER_RT_GTEST_SOURCE}
-    COMPILE_DEPS gtest ${INTERCEPTION_TEST_HEADERS}
+    COMPILE_DEPS ${INTERCEPTION_TEST_HEADERS}
     DEPS gtest
     CFLAGS ${INTERCEPTION_TEST_CFLAGS_COMMON}
     LINK_FLAGS ${INTERCEPTION_TEST_LINK_FLAGS_COMMON})

_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits