Skip to content

Hunterize 3.0.1 #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rbsheth merged 2 commits into from
May 4, 2021
Merged

Hunterize 3.0.1 #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c62d0b
Hunterize OpenEXR
hjmallon May 4, 2021
9420140
Fix macOS ARM64/x86_64 universal 2 build
hjmallon May 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/ci_workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,7 @@ jobs:
# ---------------------------------------------------------------------------
# macOS
# ---------------------------------------------------------------------------
# TODO: Add ARM64/x86_64 (universal 2) build
macos:
name: 'macOS 10.15
<AppleClang 11.0
Expand Down
14 changes: 10 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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")

Expand All @@ -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
#
Expand All @@ -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...
Expand Down
3 changes: 0 additions & 3 deletions cmake/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading