Skip to content

Commit a65c915

Browse files
committed
- fix compilation error on macos arm
- drop macos gcc as it doesn't build ocio
1 parent 2682d62 commit a65c915

3 files changed

Lines changed: 26 additions & 12 deletions

File tree

.github/workflows/cmake-build.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,6 @@ jobs:
4141
compiler: msvc
4242
compilercxx: msvc
4343
multiline-separator: "`"
44-
- name: MacOS ARM GCC
45-
os: macos-latest
46-
compiler: gcc-13
47-
compilercxx: g++-13
48-
multiline-separator: \
4944
- name: MacOS ARM AppleClang
5045
os: macos-latest
5146
compiler: clang

.github/workflows/cmake-test.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,6 @@ jobs:
4141
compiler: msvc
4242
compilercxx: msvc
4343
multiline-separator: "`"
44-
- name: MacOS ARM GCC
45-
os: macos-latest
46-
compiler: gcc-13
47-
compilercxx: g++-13
48-
multiline-separator: \
4944
- name: MacOS ARM AppleClang
5045
os: macos-latest
5146
compiler: clang

cryptomatte_api/CMakeLists.txt

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,19 @@ if (MSVC)
1515
endif()
1616

1717
# Crank up warning levels on both MSVC, Clang and GCC
18-
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang|GNU")
18+
if (CMAKE_CXX_COMPILER_ID MATCHES "AppleClang")
19+
target_compile_options(
20+
cryptomatte_api
21+
PUBLIC
22+
-fexperimental-library
23+
PRIVATE
24+
-Wall
25+
-Werror
26+
-Wextra
27+
-Wno-pass-failed=transform-warning
28+
)
29+
target_link_options(cryptomatte_api PUBLIC -fexperimental-library)
30+
elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang|GNU")
1931
target_compile_options(
2032
cryptomatte_api
2133
PRIVATE
@@ -53,7 +65,19 @@ if (MSVC)
5365
target_compile_options(cryptomatte_api_profiling PRIVATE /utf-8 /MP /DNOMINMAX)
5466
endif()
5567

56-
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang|GNU")
68+
if (CMAKE_CXX_COMPILER_ID MATCHES "AppleClang")
69+
target_compile_options(
70+
cryptomatte_api_profiling
71+
PUBLIC
72+
-fexperimental-library
73+
PRIVATE
74+
-Wall
75+
-Werror
76+
-Wextra
77+
-Wno-pass-failed=transform-warning
78+
)
79+
target_link_options(cryptomatte_api_profiling PUBLIC -fexperimental-library)
80+
elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang|GNU")
5781
target_compile_options(
5882
cryptomatte_api_profiling
5983
PRIVATE

0 commit comments

Comments
 (0)