Merge pull request #4 from hjmallon/hunter-3.0.1

Hunterize 3.0.1

Author: rbsheth

.github/workflows/ci_workflow.yml

@@ -237,6 +237,7 @@ jobs:
   # ---------------------------------------------------------------------------
   # macOS
   # ---------------------------------------------------------------------------
+  # TODO: Add ARM64/x86_64 (universal 2) build
   macos:
     name: 'macOS 10.15 
       <AppleClang 11.0 

CMakeLists.txt

@@ -4,6 +4,12 @@
 # We require this to get object library link library support
 cmake_minimum_required(VERSION 3.12)
 
+include("cmake/HunterGate.cmake")
+HunterGate(
+    URL "https://github.com/cpp-pm/hunter/archive/v0.23.300.tar.gz"
+    SHA1 "1151d539465d9cdbc880ee30f794864aec11c448"
+)
+
 if(POLICY CMP0074)
   # enable find_package(<Package>) to use <Package>_ROOT as a hint
   cmake_policy(SET CMP0074 NEW)
@@ -47,10 +53,10 @@ add_subdirectory(cmake)
 add_subdirectory(src/lib)
 add_subdirectory(src/bin)
 
-# Tell CMake where to find the OpenEXRConfig.cmake file. Makes it posible to call 
+# Tell CMake where to find the OpenEXRConfig.cmake file. Makes it posible to call
 # find_package(OpenEXR) in downstream projects
 set(OpenEXR_DIR "${CMAKE_CURRENT_BINARY_DIR}/cmake" CACHE PATH "" FORCE)
-# Add an empty OpenEXRTargets.cmake file for the config to use. 
+# Add an empty OpenEXRTargets.cmake file for the config to use.
 # Can be empty since we already defined the targets in add_subdirectory
 file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/cmake/OpenEXRTargets.cmake" "# Dummy file")
 
@@ -63,7 +69,7 @@ endif()
 # upload the results, cmake has builtin support for
 # submitting to CDash, or any server who speaks the
 # same protocol
-# 
+#
 # These settings will need to be set for your environment,
 # and then a script such as the example in
 #
@@ -74,7 +80,7 @@ endif()
 # cmake -S cmake/SampleCTestScript.cmake
 #
 # [or whatever you name the file you edit]
-# 
+#
 #set(CTEST_PROJECT_NAME "OpenEXR")
 #set(CTEST_NIGHTLY_START_TIME "01:01:01 UTC")
 #set(CTEST_DROP_METHOD "http") # there are others...

cmake/CMakeLists.txt

@@ -53,9 +53,6 @@ set(OPENEXR_IMF_HAVE_COMPLETE_IOMANIP TRUE)
 
 if(APPLE)
   set(OPENEXR_IMF_HAVE_DARWIN TRUE)
-  if (${CMAKE_OSX_ARCHITECTURES} MATCHES arm64)
-    set(OPENEXR_IMF_HAVE_GCC_INLINE_ASM_AVX FALSE)
-  endif()
 endif()
 
 if (OPENEXR_ENABLE_LARGE_STACK)