commit eaede6310a40eb4ff6b62527db5ca8f109263b87
author Fraser Cormack <fraser@codeplay.com> Mon Sep 30 10:48:30 2024 +0100
committer Copybara-Service <copybara-worker@google.com> Mon Sep 30 02:49:40 2024 -0700
tree 174ca19c2fefce21445d13bb824034aad51e6e85
parent b723c9db78e569c96133a559414e24bfd0bf5fe9

[libclc] Fix installation w/ ENABLE_RUNTIME_SUBNORMAL (#109926)

The `ARCHIVE` artifact kind is not valid for `install(FILES ...)`.

Additionally, install wasn't resolving the target's `TARGET_FILE`
properly and was trying to find it in the top-level build directory, rather than
in the libclc binary directory. This is because our `TARGET_FILE`
properties were being set to relative paths. The cmake behaviour they
are trying to mimic - `$<TARGET_FILE:$tgt>` - provides an absolute path.

As such this patch updates instances where we set the `TARGET_FILE`
property to return an absolute path.

GitOrigin-RevId: 9f3728d15721830ef1d29a8ae1af97124bc26b47

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1bf7eb2..260e4d4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -221,8 +221,10 @@
        TARGET ${file}
        INPUTS ${CMAKE_CURRENT_SOURCE_DIR}/generic/lib/${file}.ll
     )
-    install( FILES $<TARGET_PROPERTY:${file},TARGET_FILE> ARCHIVE
-      DESTINATION "${CMAKE_INSTALL_DATADIR}/clc" )
+    install(
+      FILES $<TARGET_PROPERTY:${file},TARGET_FILE>
+      DESTINATION "${CMAKE_INSTALL_DATADIR}/clc"
+    )
   endforeach()
 endif()
 
@@ -426,9 +428,9 @@
       add_custom_target( ${builtins_opt_lib_tgt}
         ALL DEPENDS ${builtins_opt_lib_tgt}.bc
       )
-      set_target_properties( ${builtins_opt_lib_tgt}
-        PROPERTIES TARGET_FILE ${builtins_opt_lib_tgt}.bc
-                   FOLDER "libclc/Device IR/Opt"
+      set_target_properties( ${builtins_opt_lib_tgt} PROPERTIES
+        TARGET_FILE ${CMAKE_CURRENT_BINARY_DIR}/${builtins_opt_lib_tgt}.bc
+        FOLDER "libclc/Device IR/Opt"
       )
 
       set( builtins_opt_lib $<TARGET_PROPERTY:${builtins_opt_lib_tgt},TARGET_FILE> )

cmake/modules/AddLibclc.cmake

diff --git a/cmake/modules/AddLibclc.cmake b/cmake/modules/AddLibclc.cmake
index 839815d..f203266 100644
--- a/cmake/modules/AddLibclc.cmake
+++ b/cmake/modules/AddLibclc.cmake
@@ -113,7 +113,7 @@
 
   add_custom_target( ${ARG_TARGET} ALL DEPENDS ${ARG_TARGET}.bc )
   set_target_properties( ${ARG_TARGET} PROPERTIES
-    TARGET_FILE ${ARG_TARGET}.bc
+    TARGET_FILE ${CMAKE_CURRENT_BINARY_DIR}/${ARG_TARGET}.bc
     FOLDER "libclc/Device IR/Linking"
   )
 endfunction()