From 42edf53ce2b201ca022d1f8170bb4323226c468a Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Wed, 3 Mar 2021 10:24:51 -0800
Subject: Tests: Generalize FindPackageModeMakefileTest extra flags var

---
 Tests/FindPackageModeMakefileTest/CMakeLists.txt | 13 +++++++------
 Tests/FindPackageModeMakefileTest/Makefile.in    |  6 +++---
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Tests/FindPackageModeMakefileTest/CMakeLists.txt b/Tests/FindPackageModeMakefileTest/CMakeLists.txt
index 8a87a8c..909ba30 100644
--- a/Tests/FindPackageModeMakefileTest/CMakeLists.txt
+++ b/Tests/FindPackageModeMakefileTest/CMakeLists.txt
@@ -19,12 +19,13 @@ if(UNIX  AND  "${CMAKE_GENERATOR}" MATCHES "Makefile" AND
     # configure a FindFoo.cmake so it knows where the library can be found
     configure_file(FindFoo.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/FindFoo.cmake @ONLY)
 
-    # Need the -isysroot flag on recentish macOS after command line tools
-    # no longer provide headers in /usr/include
-    if(APPLE AND CMAKE_OSX_SYSROOT)
-      set(__EXTRA_OSX_SYSROOT_FLAGS "-isysroot ${CMAKE_OSX_SYSROOT}")
-    else()
-      set(__EXTRA_OSX_SYSROOT_FLAGS "")
+    set(EXTRA_FLAGS "")
+    if(APPLE)
+      # Need the -isysroot flag on recentish macOS after command line tools
+      # no longer provide headers in /usr/include
+      if(CMAKE_OSX_SYSROOT)
+        string(APPEND EXTRA_FLAGS " -isysroot ${CMAKE_OSX_SYSROOT}")
+      endif()
     endif()
 
     # now set up the test:
diff --git a/Tests/FindPackageModeMakefileTest/Makefile.in b/Tests/FindPackageModeMakefileTest/Makefile.in
index af9fa96..695c64f 100644
--- a/Tests/FindPackageModeMakefileTest/Makefile.in
+++ b/Tests/FindPackageModeMakefileTest/Makefile.in
@@ -5,7 +5,7 @@ CMAKE_CURRENT_BINARY_DIR = "@CMAKE_CURRENT_BINARY_DIR@"
 CMAKE_CXX_COMPILER = "@CMAKE_CXX_COMPILER@"
 CMAKE_CXX_COMPILER_ID = "@CMAKE_CXX_COMPILER_ID@"
 CMAKE_CXX_FLAGS = @CMAKE_CXX_FLAGS@
-__EXTRA_OSX_SYSROOT_FLAGS = @__EXTRA_OSX_SYSROOT_FLAGS@
+EXTRA_FLAGS = @EXTRA_FLAGS@
 
 CMAKE_FOO = $(CMAKE) --find-package -DCMAKE_MODULE_PATH=$(CMAKE_CURRENT_BINARY_DIR) -DNAME=Foo -DLANGUAGE=CXX -DCOMPILER_ID=$(CMAKE_CXX_COMPILER_ID)
 
@@ -16,7 +16,7 @@ all: pngtest
 main.o: clean main.cpp
 	@$(CMAKE_FOO) -DMODE=COMPILE >$(tmp)
 	@foo="`cat $(tmp)`"; \
-	 printf '"%s" %s %s %s -c main.cpp\n' $(CMAKE_CXX_COMPILER) "$(CMAKE_CXX_FLAGS)" "$(__EXTRA_OSX_SYSROOT_FLAGS)" "$$foo" >$(tmp)
+	 printf '"%s" %s %s %s -c main.cpp\n' $(CMAKE_CXX_COMPILER) "$(CMAKE_CXX_FLAGS)" "$(EXTRA_FLAGS)" "$$foo" >$(tmp)
 	@cat $(tmp)
 	@sh $(tmp)
 	@rm -f $(tmp)
@@ -24,7 +24,7 @@ main.o: clean main.cpp
 pngtest: main.o
 	@$(CMAKE_FOO) -DMODE=LINK >$(tmp)
 	@foo="`cat $(tmp)`"; \
-	 printf '"%s" %s %s %s -o pngtest main.o %s\n' $(CMAKE_CXX_COMPILER) "$(CMAKE_CXX_FLAGS)" "$(__EXTRA_OSX_SYSROOT_FLAGS)" "$(LDFLAGS)" "$$foo" >$(tmp)
+	 printf '"%s" %s %s %s -o pngtest main.o %s\n' $(CMAKE_CXX_COMPILER) "$(CMAKE_CXX_FLAGS)" "$(EXTRA_FLAGS)" "$(LDFLAGS)" "$$foo" >$(tmp)
 	@cat $(tmp)
 	@sh $(tmp)
 	@rm -f $(tmp)
-- 
cgit v0.12


From fd714dd2b83b86ad4ff5aaf0f7bbfec88525f08f Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Wed, 3 Mar 2021 10:29:06 -0800
Subject: Tests: Fix FindPackageModeMakefileTest with CMAKE_OSX_ARCHITECTURES

---
 Tests/FindPackageModeMakefileTest/CMakeLists.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Tests/FindPackageModeMakefileTest/CMakeLists.txt b/Tests/FindPackageModeMakefileTest/CMakeLists.txt
index 909ba30..0b15be8 100644
--- a/Tests/FindPackageModeMakefileTest/CMakeLists.txt
+++ b/Tests/FindPackageModeMakefileTest/CMakeLists.txt
@@ -26,6 +26,9 @@ if(UNIX  AND  "${CMAKE_GENERATOR}" MATCHES "Makefile" AND
       if(CMAKE_OSX_SYSROOT)
         string(APPEND EXTRA_FLAGS " -isysroot ${CMAKE_OSX_SYSROOT}")
       endif()
+      foreach(arch ${CMAKE_OSX_ARCHITECTURES})
+        string(APPEND EXTRA_FLAGS " -arch ${arch}")
+      endforeach()
     endif()
 
     # now set up the test:
-- 
cgit v0.12