From 9096c8d06fa8f8107870c3beafc7838277b63f2e Mon Sep 17 00:00:00 2001
From: Brad Linden <brad@lindenlab.com>
Date: Tue, 18 Apr 2023 14:43:04 -0700
Subject: Experiment with turning on MacOS builds for github based nightly
 builds for DRTVWR-559

---
 indra/cmake/LLAddBuildTest.cmake | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'indra')

diff --git a/indra/cmake/LLAddBuildTest.cmake b/indra/cmake/LLAddBuildTest.cmake
index bf569e5d99..405128d661 100644
--- a/indra/cmake/LLAddBuildTest.cmake
+++ b/indra/cmake/LLAddBuildTest.cmake
@@ -126,6 +126,13 @@ MACRO(LL_ADD_PROJECT_UNIT_TESTS project sources)
       message("LL_ADD_PROJECT_UNIT_TESTS ${name}_test_additional_CFLAGS ${${name}_test_additional_CFLAGS}")
     endif()
 
+    if (DARWIN)
+      # test binaries always need to be signed for local development
+      set_target_properties(PROJECT_${project}_TEST_${name}
+	      PROPERTIES
+              XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "-")
+    endif ()
+
     #
     # Setup test targets
     #
@@ -221,6 +228,13 @@ FUNCTION(LL_ADD_INTEGRATION_TEST
             )
   endif ()
 
+  if (DARWIN)
+    # test binaries always need to be signed for local development
+    set_target_properties(INTEGRATION_TEST_${testname}
+            PROPERTIES
+	    XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "-")
+  endif ()
+
   # Add link deps to the executable
   if(TEST_DEBUG)
     message(STATUS "TARGET_LINK_LIBRARIES(INTEGRATION_TEST_${testname} ${libraries})")
-- 
cgit v1.2.3


From 7d23f91b1681a99d7fd22183bb11c486d9d7d27f Mon Sep 17 00:00:00 2001
From: Brad Linden <brad@lindenlab.com>
Date: Wed, 3 May 2023 15:47:19 -0700
Subject: Added ability to disable required OSX_SYSROOT cmake checks

---
 indra/cmake/Variables.cmake | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'indra')

diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake
index 79de3a9055..ade0653cf7 100644
--- a/indra/cmake/Variables.cmake
+++ b/indra/cmake/Variables.cmake
@@ -173,13 +173,17 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
   set(CMAKE_XCODE_ATTRIBUTE_GCC_OPTIMIZATION_LEVEL "${CMAKE_MATCH_1}")
   message(STATUS "CMAKE_XCODE_ATTRIBUTE_GCC_OPTIMIZATION_LEVEL = '${CMAKE_XCODE_ATTRIBUTE_GCC_OPTIMIZATION_LEVEL}'")
 
-  string(REGEX MATCHALL "[^ ]+" LL_BUILD_LIST "$ENV{LL_BUILD}")
-  list(FIND LL_BUILD_LIST "-iwithsysroot" sysroot_idx)
-  if ("${sysroot_idx}" LESS 0)
-    message(FATAL_ERROR "Environment variable LL_BUILD must contain '-iwithsysroot'")
-  endif ()
-  math(EXPR sysroot_idx "${sysroot_idx} + 1")
-  list(GET LL_BUILD_LIST "${sysroot_idx}" CMAKE_OSX_SYSROOT)
+  # allow disabling this check by setting LL_SKIP_REQUIRE_SYSROOT either ON as cmake cache var or non-empty as environment var
+  set(LL_SKIP_REQUIRE_SYSROOT OFF CACHE BOOL "Skip requirent to set toolchain sysroot ahead of time. Not skipped by default for consistency, but skipping can be useful for selecting alternative xcode versions side by side")
+  if("$ENV{LL_SKIP_REQUIRE_SYSROOT}" STREQUAL "" AND NOT ${LL_SKIP_REQUIRE_SYSROOT})
+    string(REGEX MATCHALL "[^ ]+" LL_BUILD_LIST "$ENV{LL_BUILD}")
+    list(FIND LL_BUILD_LIST "-iwithsysroot" sysroot_idx)
+    if ("${sysroot_idx}" LESS 0)
+      message(FATAL_ERROR "Environment variable LL_BUILD must contain '-iwithsysroot'")
+    endif ()
+    math(EXPR sysroot_idx "${sysroot_idx} + 1")
+    list(GET LL_BUILD_LIST "${sysroot_idx}" CMAKE_OSX_SYSROOT)
+  endif()
   message(STATUS "CMAKE_OSX_SYSROOT = '${CMAKE_OSX_SYSROOT}'")
 
   set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvm.clang.1_0")
-- 
cgit v1.2.3


From c75b0079d9b711481aff11b4fb959552ea5611ad Mon Sep 17 00:00:00 2001
From: Brad Linden <brad@lindenlab.com>
Date: Thu, 4 May 2023 11:28:29 -0700
Subject: Fix typo

---
 indra/cmake/Variables.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake
index ade0653cf7..469fb3d330 100644
--- a/indra/cmake/Variables.cmake
+++ b/indra/cmake/Variables.cmake
@@ -174,7 +174,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
   message(STATUS "CMAKE_XCODE_ATTRIBUTE_GCC_OPTIMIZATION_LEVEL = '${CMAKE_XCODE_ATTRIBUTE_GCC_OPTIMIZATION_LEVEL}'")
 
   # allow disabling this check by setting LL_SKIP_REQUIRE_SYSROOT either ON as cmake cache var or non-empty as environment var
-  set(LL_SKIP_REQUIRE_SYSROOT OFF CACHE BOOL "Skip requirent to set toolchain sysroot ahead of time. Not skipped by default for consistency, but skipping can be useful for selecting alternative xcode versions side by side")
+  set(LL_SKIP_REQUIRE_SYSROOT OFF CACHE BOOL "Skip requirement to set toolchain sysroot ahead of time. Not skipped by default for consistency, but skipping can be useful for selecting alternative xcode versions side by side")
   if("$ENV{LL_SKIP_REQUIRE_SYSROOT}" STREQUAL "" AND NOT ${LL_SKIP_REQUIRE_SYSROOT})
     string(REGEX MATCHALL "[^ ]+" LL_BUILD_LIST "$ENV{LL_BUILD}")
     list(FIND LL_BUILD_LIST "-iwithsysroot" sysroot_idx)
-- 
cgit v1.2.3