Skip to content

Fix macOS Apple Silicon build and CPack packaging #1753

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

Open
roberto-cito wants to merge 1 commit into
base: next
Choose a base branch
from
Open

Fix macOS Apple Silicon build and CPack packaging #1753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,14 @@ set(CMAKE_LINK_DEPENDS_NO_SHARED 1)

if(APPLE)
set(CMAKE_OSX_DEPLOYMENT_TARGET
"10.12"
"10.15"
CACHE STRING
"The earliest version of MacOS X that MiKTeX will run on."
)
if(EXISTS "/opt/homebrew/opt/icu4c")
set(ICU_ROOT "/opt/homebrew/opt/icu4c" CACHE PATH "Homebrew ICU root")
set(ICU_INCLUDE_DIR "/opt/homebrew/opt/icu4c/include" CACHE PATH "Homebrew ICU include dir")
endif()
#set(CMAKE_EXE_LINKER_FLAGS "-Wl,-no_weak_imports")
endif()

Expand Down
1 change: 1 addition & 0 deletions Libraries/3rd/cairo/cairo-features.h.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#cmakedefine CAIRO_HAS_PDF_SURFACE 1
#cmakedefine CAIRO_HAS_PNG_FUNCTIONS 1
#cmakedefine CAIRO_HAS_PS_SURFACE 1
#cmakedefine CAIRO_HAS_PTHREAD 1
#cmakedefine CAIRO_HAS_RECORDING_SURFACE 1
#cmakedefine CAIRO_HAS_SCRIPT_SURFACE 1
#cmakedefine CAIRO_HAS_SVG_SURFACE 1
Expand Down
2 changes: 2 additions & 0 deletions Libraries/3rd/cairo/config.h.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@

#cmakedefine HAVE_ZLIB 1

#define HAVE_CTIME_R 1

#define SIZEOF_INT ${SIZEOF_INT}

#define SIZEOF_LONG ${SIZEOF_LONG}
Expand Down
7 changes: 7 additions & 0 deletions Programs/MiKTeX/Console/Qt/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,14 +258,21 @@ if(MIKTEX_MACOS_BUNDLE)
set(fixup_exe "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${MIKTEX_MACOS_BUNDLE_DIR}/MacOS/${MIKTEX_MACOS_BUNDLE_NAME}")
# FIXME: non-standard icu lib dir
list(APPEND lib_dirs "/usr/local/opt/poppler-qt5/lib")
list(APPEND lib_dirs "/opt/homebrew/opt/poppler/lib")
# FIXME: non-standard poppler-qt5 lib dir
list(APPEND lib_dirs "/usr/local/opt/icu4c/lib")
list(APPEND lib_dirs "/opt/homebrew/opt/icu4c/lib")
list(APPEND lib_dirs "/opt/homebrew/opt/qt/lib")
list(APPEND lib_dirs "/opt/homebrew/lib")
list(APPEND lib_dirs "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${MIKTEX_LIBRARY_DESTINATION_DIR}")
install(CODE "
include(${CMAKE_SOURCE_DIR}/cmake/modules/BundleUtilitiesOverrides.cmake)
include(BundleUtilities)
set(BU_CHMOD_BUNDLE_ITEMS ON)
fixup_bundle(\"${fixup_exe}\" \"${QT_PLUGINS}\" \"${Qt_BIN_DIR};${QT_LIBRARY_DIR};${QT_BINARY_DIR};${lib_dirs}\")
execute_process(COMMAND sh -c \"find '\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${MIKTEX_MACOS_BUNDLE_NAME}.app' -type f -name '*.dylib' -exec codesign --force --sign - {} +\")
execute_process(COMMAND sh -c \"find '\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${MIKTEX_MACOS_BUNDLE_NAME}.app/Contents/MacOS' -type f -exec codesign --force --sign - {} +\")
execute_process(COMMAND codesign --force --deep --sign - \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${MIKTEX_MACOS_BUNDLE_NAME}.app\")
")
endif()

Expand Down
1 change: 1 addition & 0 deletions cmake/modules/InstallQtPlugin.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
macro(install_qt_plugin _qt_plugin_name _qt_plugins_var)
get_target_property(_qt_plugin_path "${_qt_plugin_name}" LOCATION)
if(EXISTS "${_qt_plugin_path}")
get_filename_component(_qt_plugin_path "${_qt_plugin_path}" REALPATH)
get_filename_component(_qt_plugin_file "${_qt_plugin_path}" NAME)
get_filename_component(_qt_plugin_type "${_qt_plugin_path}" PATH)
get_filename_component(_qt_plugin_type "${_qt_plugin_type}" NAME)
Expand Down