Skip to content

Commit a56d979

Browse files
committed
cmake: only disable libpng-apng in intel mac CI, not for self builds.
A test locally worked just fine on my end... (2018 MBP)
1 parent 90051ce commit a56d979

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

gui/qt/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -284,16 +284,16 @@ if(PkgConfig_FOUND)
284284
endif()
285285
endif()
286286

287-
if(APPLE AND NOT (CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "arm64"))
288-
message("For now, libpng-apng is disabled on intel macs... see issue #528. APNG capture will not be available")
287+
if((DEFINED ENV{GITHUB_ACTION}) AND APPLE AND NOT (CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "arm64"))
288+
message("For now, libpng-apng is disabled on intel macs on CI... see issue #528. APNG capture will not be available")
289289
else()
290290
find_package(PNG QUIET)
291291
if(PNG_FOUND)
292292
include(CheckSymbolExists)
293293
set(CMAKE_REQUIRED_INCLUDES ${PNG_INCLUDE_DIRS})
294294
check_symbol_exists(PNG_WRITE_APNG_SUPPORTED "png.h" HAVE_PROPER_APNG_LIB)
295295
if(HAVE_PROPER_APNG_LIB)
296-
set_property(TARGET CEmu PROPERTY AUTOMOC_MOC_OPTIONS "-DPNG_WRITE_APNG_SUPPORTED")
296+
list(APPEND CMAKE_AUTOMOC_MOC_OPTIONS "-DPNG_SUPPORT" "-DPNG_WRITE_APNG_SUPPORTED")
297297
target_compile_definitions(CEmu PRIVATE "PNG_SUPPORT")
298298
target_link_libraries(CEmu PRIVATE PNG::PNG)
299299
else()

0 commit comments

Comments
 (0)