From 8e3b61e48a42566dd5b35c8cc9d2777a154771e4 Mon Sep 17 00:00:00 2001
From: Dan Liew <dan@su-root.co.uk>
Date: Tue, 10 Jul 2018 16:22:05 +0000
Subject: Try to fix broken build due to r336663.

It turns out that the `${XRAY_HEADERS}` CMake variable was already
in use and was used for public headers. It seems that
`lib/xray/tests/CMakeLists.txt` was depending on this.

To fix rename the new `${XRAY_HEADERS}` to `${XRAY_IMPL_HEADERS}`.

git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@336699 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/xray/CMakeLists.txt | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'lib')

diff --git a/lib/xray/CMakeLists.txt b/lib/xray/CMakeLists.txt
index 5ff1d780a..36b310f17 100644
--- a/lib/xray/CMakeLists.txt
+++ b/lib/xray/CMakeLists.txt
@@ -60,7 +60,7 @@ set(powerpc64le_SOURCES
     xray_trampoline_powerpc64.cc
     xray_trampoline_powerpc64_asm.S)
 
-set(XRAY_HEADERS
+set(XRAY_IMPL_HEADERS
   xray_allocator.h
   xray_basic_flags.h
   xray_basic_flags.inc
@@ -121,7 +121,7 @@ if (APPLE)
     OS ${XRAY_SUPPORTED_OS}
     ARCHS ${XRAY_SUPPORTED_ARCH}
     SOURCES ${x86_64_SOURCES}
-    ADDITIONAL_HEADERS ${XRAY_HEADERS}
+    ADDITIONAL_HEADERS ${XRAY_IMPL_HEADERS}
     CFLAGS ${XRAY_CFLAGS}
     DEFS ${XRAY_COMMON_DEFINITIONS}
     DEPS ${XRAY_DEPS})
@@ -129,7 +129,7 @@ if (APPLE)
     OS ${XRAY_SUPPORTED_OS}
     ARCHS ${XRAY_SUPPORTED_ARCH}
     SOURCES ${XRAY_FDR_MODE_SOURCES}
-    ADDITIONAL_HEADERS ${XRAY_HEADERS}
+    ADDITIONAL_HEADERS ${XRAY_IMPL_HEADERS}
     CFLAGS ${XRAY_CFLAGS}
     DEFS ${XRAY_COMMON_DEFINITIONS}
     DEPS ${XRAY_DEPS})
@@ -137,7 +137,7 @@ if (APPLE)
     OS ${XRAY_SUPPORTED_OS}
     ARCHS ${XRAY_SUPPORTED_ARCH}
     SOURCES ${XRAY_BASIC_MODE_SOURCES}
-    ADDITIONAL_HEADERS ${XRAY_HEADERS}
+    ADDITIONAL_HEADERS ${XRAY_IMPL_HEADERS}
     CFLAGS ${XRAY_CFLAGS}
     DEFS ${XRAY_COMMON_DEFINITIONS}
     DEPS ${XRAY_DEPS})
@@ -145,7 +145,7 @@ if (APPLE)
     OS ${XRAY_SUPPORTED_OS}
     ARCHS ${XRAY_SUPPORTED_ARCH}
     SOURCES ${XRAY_PROFILING_MODE_SOURCES}
-    ADDITIONAL_HEADERS ${XRAY_HEADERS}
+    ADDITIONAL_HEADERS ${XRAY_IMPL_HEADERS}
     CFLAGS ${XRAY_CFLAGS}
     DEFS ${XRAY_COMMON_DEFINITIONS}
     DEPS ${XRAY_DEPS})
@@ -201,28 +201,28 @@ else() # not Apple
     add_compiler_rt_object_libraries(RTXray
       ARCHS ${arch}
       SOURCES ${XRAY_SOURCES} ${${arch}_SOURCES}
-      ADDITIONAL_HEADERS ${XRAY_HEADERS}
+      ADDITIONAL_HEADERS ${XRAY_IMPL_HEADERS}
       CFLAGS ${XRAY_CFLAGS}
       DEFS ${XRAY_COMMON_DEFINITIONS}
       DEPS ${XRAY_DEPS})
     add_compiler_rt_object_libraries(RTXrayFDR
       ARCHS ${arch}
       SOURCES ${XRAY_FDR_MODE_SOURCES}
-      ADDITIONAL_HEADERS ${XRAY_HEADERS}
+      ADDITIONAL_HEADERS ${XRAY_IMPL_HEADERS}
       CFLAGS ${XRAY_CFLAGS}
       DEFS ${XRAY_COMMON_DEFINITIONS}
       DEPS ${XRAY_DEPS})
     add_compiler_rt_object_libraries(RTXrayBASIC
       ARCHS ${arch}
       SOURCES ${XRAY_BASIC_MODE_SOURCES}
-      ADDITIONAL_HEADERS ${XRAY_HEADERS}
+      ADDITIONAL_HEADERS ${XRAY_IMPL_HEADERS}
       CFLAGS ${XRAY_CFLAGS}
       DEFS ${XRAY_COMMON_DEFINITIONS}
       DEPS ${XRAY_DEPS})
     add_compiler_rt_object_libraries(RTXrayPROFILING
       ARCHS ${arch}
       SOURCES ${XRAY_PROFILING_MODE_SOURCES}
-      ADDITIONAL_HEADERS ${XRAY_HEADERS}
+      ADDITIONAL_HEADERS ${XRAY_IMPL_HEADERS}
       CFLAGS ${XRAY_CFLAGS}
       DEFS ${XRAY_COMMON_DEFINITIONS}
       DEPS ${XRAY_DEPS})
-- 
cgit v1.2.3