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/+/44108Tested-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>

CMake: use target_compile_options/definitions for llvm
56571062 · Antonio Maiorano · 63aa954a · 56571062 · 56571062
Commit 56571062 authored Apr 20, 2020 by Antonio Maiorano
Hide whitespace changes
Inline Side-by-side

Showing with 45 additions and 9 deletions

CMakeLists.txt third_party/llvm-10.0/CMakeLists.txt +28 -6

CMakeLists.txt third_party/llvm-7.0/CMakeLists.txt +17 -3

No files found.
--- a/third_party/llvm-10.0/CMakeLists.txt
+++ b/third_party/llvm-10.0/CMakeLists.txt
@@ -1202,13 +1202,27 @@ elseif(FUCHSIA)
 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 @@ if(SWIFTSHADER_EMIT_COVERAGE)
    )
    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)

--- a/third_party/llvm-7.0/CMakeLists.txt
+++ b/third_party/llvm-7.0/CMakeLists.txt
@@ -977,14 +977,28 @@ elseif(FUCHSIA)
 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)