Skip to content

Commit

Permalink
fix architecture issue with github action
Browse files Browse the repository at this point in the history
  • Loading branch information
dfober committed Sep 19, 2024
1 parent ac93e01 commit f6f95ce
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 0 deletions.
4 changes: 4 additions & 0 deletions environments/Qt/apps/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ else()
set (GUIDO_LIBRARY "-L${GUIDODIR}/build/lib -lGUIDOEngine")
endif()

if (APPLE AND NOT IOS)
set(CMAKE_OSX_ARCHITECTURES x86_64)
endif()

set (CMAKE_BUILD_RPATH "${GUIDODIR}/build/lib")
set (CMAKE_SKIP_BUILD_RPATH FALSE)

Expand Down
5 changes: 5 additions & 0 deletions environments/Qt/tools/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,11 @@ if (WIN32)
elseif(APPLE)
set(EXE MACOSX_BUNDLE)
endif()

if (APPLE AND NOT IOS)
set(CMAKE_OSX_ARCHITECTURES x86_64)
endif()

set (VSRC GuidoQtFontViewer/main.cpp GuidoQtFontViewer/QFontDisplayer.cpp GuidoQtFontViewer/QFontDisplayer.h )
add_executable(${fontviewer} ${EXE} ${VSRC} )
target_include_directories (${fontviewer} PRIVATE ${QTINCDIRS})
Expand Down

0 comments on commit f6f95ce

Please sign in to comment.