Support CMAKE_OSX_ARCHITECTURES (#8390)

halide · Sep 4, 2024 · b3c8c8b · b3c8c8b
1 parent 97eeaf0
commit b3c8c8b
Show file tree

Hide file tree

Showing 19 changed files with 658 additions and 407 deletions.
diff --git a/apps/cuda_mat_mul/CMakeLists.txt b/apps/cuda_mat_mul/CMakeLists.txt
@@ -29,7 +29,6 @@ add_halide_generator(mat_mul.generator SOURCES mat_mul_generator.cpp)
 
 # Filters
 add_halide_library(mat_mul FROM mat_mul.generator
-                   TARGETS host
                    FEATURES cuda cuda_capability_50
                    PARAMS size=1024)
 

diff --git a/apps/hannk/cmake/superbuild/CMakeLists.txt b/apps/hannk/cmake/superbuild/CMakeLists.txt
@@ -46,11 +46,8 @@ set(ep_opts
     SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/../.."
     BUILD_ALWAYS YES
     USES_TERMINAL_CONFIGURE YES
-    USES_TERMINAL_BUILD YES)
-
-if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.20)
-    list(APPEND ep_opts CONFIGURE_HANDLED_BY_BUILD TRUE)
-endif ()
+    USES_TERMINAL_BUILD YES
+    CONFIGURE_HANDLED_BY_BUILD TRUE)
 
 ##
 # Define host and target builds

diff --git a/cmake/BundleStatic.cmake b/cmake/BundleStatic.cmake
@@ -22,12 +22,10 @@ function(_bundle_static_check_output VAR)
     set("${VAR}" "${${VAR}}" PARENT_SCOPE)
 endfunction()
 
-function(_bundle_static_is_apple_libtool result item)
+function(_bundle_static_is_apple_libtool result_var item)
     _bundle_static_check_output(version_info "${item}" -V)
-    if (version_info MATCHES "Apple, Inc.")
-        set(result 1 PARENT_SCOPE)
-    else ()
-        set(result 0 PARENT_SCOPE)
+    if (NOT version_info MATCHES "Apple, Inc.")
+        set(${result_var} 0 PARENT_SCOPE)
     endif ()
 endfunction()