[compiler-rt] r336699 - Try to fix broken build due to r336663.

[Dan Liew via llvm-commits]

Author: delcypher
Date: Tue Jul 10 09:22:05 2018
New Revision: 336699

URL: http://llvm.org/viewvc/llvm-project?rev=336699&view=rev
Log:
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}`.

Modified:
    compiler-rt/trunk/lib/xray/CMakeLists.txt

Modified: compiler-rt/trunk/lib/xray/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/xray/CMakeLists.txt?rev=336699&r1=336698&r2=336699&view=diff
==============================================================================
--- compiler-rt/trunk/lib/xray/CMakeLists.txt (original)
+++ compiler-rt/trunk/lib/xray/CMakeLists.txt Tue Jul 10 09:22:05 2018
@@ -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})