commit bf4069e3af80203fd67256eb99456f4a0f753b80
author Ben Vanik <benvanik@google.com> Sat Nov 14 11:23:01 2020 -0800
committer Ben Vanik <benvanik@google.com> Fri Nov 20 15:48:18 2020 -0800
tree f1a69167b2b8b3f65c313790cbff981bf89eef67
parent 28040cd84c185a5b644102a2efb7edb903e9e461

Sorting copts/linkopts so we can override things.

build_tools/cmake/external_cc_library.cmake

diff --git a/build_tools/cmake/external_cc_library.cmake b/build_tools/cmake/external_cc_library.cmake
index dd9799b..42859a3 100644
--- a/build_tools/cmake/external_cc_library.cmake
+++ b/build_tools/cmake/external_cc_library.cmake
@@ -134,8 +134,8 @@
       PUBLIC
         ${_RULE_DEPS}
       PRIVATE
-        ${_RULE_LINKOPTS}
         ${IREE_DEFAULT_LINKOPTS}
+        ${_RULE_LINKOPTS}
     )
     target_compile_definitions(${_NAME}
       PUBLIC
@@ -169,14 +169,14 @@
     )
     target_compile_options(${_NAME}
       INTERFACE
-        ${_RULE_COPTS}
         ${IREE_DEFAULT_COPTS}
+        ${_RULE_COPTS}
     )
     target_link_libraries(${_NAME}
       INTERFACE
-        ${_RULE_DEPS}
-        ${_RULE_LINKOPTS}
         ${IREE_DEFAULT_LINKOPTS}
+        ${_RULE_LINKOPTS}
+        ${_RULE_DEPS}
     )
     iree_add_data_dependencies(NAME ${_NAME} DATA ${_RULE_DATA})
     target_compile_definitions(${_NAME}

build_tools/cmake/flatbuffer_c_library.cmake

diff --git a/build_tools/cmake/flatbuffer_c_library.cmake b/build_tools/cmake/flatbuffer_c_library.cmake
index 24ee470..daffc36 100644
--- a/build_tools/cmake/flatbuffer_c_library.cmake
+++ b/build_tools/cmake/flatbuffer_c_library.cmake
@@ -138,8 +138,8 @@
   target_link_libraries(${_NAME}
     INTERFACE
       flatcc::runtime
-      ${_RULE_LINKOPTS}
       ${IREE_DEFAULT_LINKOPTS}
+      ${_RULE_LINKOPTS}
   )
   target_compile_definitions(${_NAME}
     INTERFACE

build_tools/cmake/flatbuffer_cc_library.cmake

diff --git a/build_tools/cmake/flatbuffer_cc_library.cmake b/build_tools/cmake/flatbuffer_cc_library.cmake
index 52618de..bfff085 100644
--- a/build_tools/cmake/flatbuffer_cc_library.cmake
+++ b/build_tools/cmake/flatbuffer_cc_library.cmake
@@ -121,8 +121,8 @@
   target_link_libraries(${_NAME}
     INTERFACE
       flatbuffers
-      ${_RULE_LINKOPTS}
       ${IREE_DEFAULT_LINKOPTS}
+      ${_RULE_LINKOPTS}
   )
   target_compile_definitions(${_NAME}
     INTERFACE

build_tools/cmake/iree_cc_binary.cmake

diff --git a/build_tools/cmake/iree_cc_binary.cmake b/build_tools/cmake/iree_cc_binary.cmake
index 5e1bd0a..88e7c0e 100644
--- a/build_tools/cmake/iree_cc_binary.cmake
+++ b/build_tools/cmake/iree_cc_binary.cmake
@@ -120,12 +120,13 @@
   )
   target_compile_options(${_NAME}
     PRIVATE
+      ${IREE_DEFAULT_COPTS}
       ${_RULE_COPTS}
   )
   target_link_options(${_NAME}
     PRIVATE
-      ${_RULE_LINKOPTS}
       ${IREE_DEFAULT_LINKOPTS}
+      ${_RULE_LINKOPTS}
   )
   iree_add_data_dependencies(NAME ${_NAME} DATA ${_RULE_DATA})
 

build_tools/cmake/iree_cc_library.cmake

diff --git a/build_tools/cmake/iree_cc_library.cmake b/build_tools/cmake/iree_cc_library.cmake
index e4d5b67..ee2e9cb 100644
--- a/build_tools/cmake/iree_cc_library.cmake
+++ b/build_tools/cmake/iree_cc_library.cmake
@@ -130,8 +130,8 @@
     )
     target_compile_options(${_NAME}
       PRIVATE
-        ${_RULE_COPTS}
         ${IREE_DEFAULT_COPTS}
+        ${_RULE_COPTS}
     )
 
   if(_RULE_WHOLEARCHIVE)
@@ -141,8 +141,8 @@
     endif()
     target_link_libraries(${_NAME}
       PRIVATE
-        ${_RULE_LINKOPTS}
         ${IREE_DEFAULT_LINKOPTS}
+        ${_RULE_LINKOPTS}
     )
 
     iree_add_data_dependencies(NAME ${_NAME} DATA ${_RULE_DATA})
@@ -176,14 +176,14 @@
     )
     target_compile_options(${_NAME}
       INTERFACE
-        ${_RULE_COPTS}
         ${IREE_DEFAULT_COPTS}
+        ${_RULE_COPTS}
     )
     target_link_libraries(${_NAME}
       INTERFACE
+        ${IREE_DEFAULT_LINKOPTS}
         ${_RULE_DEPS}
         ${_RULE_LINKOPTS}
-        ${IREE_DEFAULT_LINKOPTS}
     )
     iree_add_data_dependencies(NAME ${_NAME} DATA ${_RULE_DATA})
     target_compile_definitions(${_NAME}

build_tools/cmake/iree_cc_test.cmake

diff --git a/build_tools/cmake/iree_cc_test.cmake b/build_tools/cmake/iree_cc_test.cmake
index 4ae27fb..98d4e1a 100644
--- a/build_tools/cmake/iree_cc_test.cmake
+++ b/build_tools/cmake/iree_cc_test.cmake
@@ -90,12 +90,13 @@
   )
   target_compile_options(${_NAME}
     PRIVATE
+      ${IREE_DEFAULT_COPTS}
       ${_RULE_COPTS}
   )
   target_link_options(${_NAME}
     PRIVATE
-      ${_RULE_LINKOPTS}
       ${IREE_DEFAULT_LINKOPTS}
+      ${_RULE_LINKOPTS}
   )
   iree_add_data_dependencies(NAME ${_NAME} DATA ${_RULE_DATA})
   # Add all IREE targets to a folder in the IDE for organization.