commit 5657106292f1224c41f21eef748a8d1f0265f6a6
author Antonio Maiorano <amaiorano@google.com> Mon Apr 20 17:34:47 2020 -0400
committer Antonio Maiorano <amaiorano@google.com> Wed Apr 22 19:30:42 2020 +0000
tree 2ee856544ecb3b60a21309083a8f35643357bcff
parent 63aa954a7a443a2b99dd9e8b01d6b5c4f3ca7e9c

CMake: use target_compile_options/definitions for llvm

I missed these when factoring out the root CMakeLists into multiple
files.

Bug: b/145758253
Change-Id: I9c5869b8bab01d823ae064ef7906566afe1e5933
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/44108
Tested-by: Antonio Maiorano <amaiorano@google.com>
Kokoro-Result: kokoro <noreply+kokoro@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Reviewed-by: Ben Clayton <bclayton@google.com>

third_party/llvm-10.0/CMakeLists.txt

diff --git a/third_party/llvm-10.0/CMakeLists.txt b/third_party/llvm-10.0/CMakeLists.txt
index 979f63b..3d4d6e5 100644
--- a/third_party/llvm-10.0/CMakeLists.txt
+++ b/third_party/llvm-10.0/CMakeLists.txt
@@ -1202,13 +1202,27 @@
 endif()
 
 add_library(llvm STATIC EXCLUDE_FROM_ALL ${LLVM_LIST})
+
 set_target_properties(llvm PROPERTIES
     POSITION_INDEPENDENT_CODE 1
-    COMPILE_OPTIONS "${LLVM_COMPILE_OPTIONS}"
-    COMPILE_DEFINITIONS "__STDC_CONSTANT_MACROS; __STDC_LIMIT_MACROS;"
     FOLDER "LLVM"
 )
-target_include_directories(llvm PUBLIC "${LLVM_INCLUDE_DIR}")
+
+target_include_directories(llvm
+    PUBLIC
+        "${LLVM_INCLUDE_DIR}"
+)
+
+target_compile_options(llvm
+    PUBLIC
+        "${LLVM_COMPILE_OPTIONS}"
+)
+
+target_compile_definitions(llvm
+    PUBLIC
+        "__STDC_CONSTANT_MACROS"
+        "__STDC_LIMIT_MACROS"
+)
 
 # Add required libraries for LLVM
 if(LINUX OR APPLE)
@@ -1228,11 +1242,19 @@
     )
     set_target_properties(llvm-with-cov PROPERTIES
         POSITION_INDEPENDENT_CODE 1
-        COMPILE_OPTIONS "${LLVM_COMPILE_OPTIONS}"
-        COMPILE_DEFINITIONS "__STDC_CONSTANT_MACROS; __STDC_LIMIT_MACROS;"
         FOLDER "LLVM"
     )
-    target_include_directories(llvm-with-cov PUBLIC "${LLVM_INCLUDE_DIR}")
+
+    target_include_directories(llvm-with-cov
+        PUBLIC
+            ${LLVM_INCLUDE_DIR}
+    )
+
+    target_compile_options(llvm-with-cov
+        PUBLIC
+            "__STDC_CONSTANT_MACROS"
+            "__STDC_LIMIT_MACROS"
+    )
 
     if(LINUX OR APPLE)
         target_link_libraries(llvm-with-cov llvm pthread)

third_party/llvm-7.0/CMakeLists.txt

diff --git a/third_party/llvm-7.0/CMakeLists.txt b/third_party/llvm-7.0/CMakeLists.txt
index 0b55d1c..7ba9ac1 100644
--- a/third_party/llvm-7.0/CMakeLists.txt
+++ b/third_party/llvm-7.0/CMakeLists.txt
@@ -977,14 +977,28 @@
 endif()
 
 add_library(llvm STATIC EXCLUDE_FROM_ALL ${LLVM_LIST})
+
 set_target_properties(llvm PROPERTIES
     POSITION_INDEPENDENT_CODE 1
     INCLUDE_DIRECTORIES "${LLVM_INCLUDE_DIR}"
-    COMPILE_OPTIONS "${LLVM_COMPILE_OPTIONS}"
-    COMPILE_DEFINITIONS "__STDC_CONSTANT_MACROS; __STDC_LIMIT_MACROS;"
     FOLDER "LLVM"
 )
-target_include_directories(llvm PUBLIC "${LLVM_INCLUDE_DIR}")
+
+target_include_directories(llvm
+    PUBLIC
+        ${LLVM_INCLUDE_DIR}
+)
+
+target_compile_options(llvm
+    PUBLIC
+        ${LLVM_COMPILE_OPTIONS}
+)
+
+target_compile_definitions(llvm
+    PUBLIC
+        "__STDC_CONSTANT_MACROS"
+        "__STDC_LIMIT_MACROS"
+)
 
 # Add required libraries for LLVM
 if(LINUX)