diff --git a/CMakeLists.txt b/CMakeLists.txt index 83ef829c0..269c41e19 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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() diff --git a/Libraries/3rd/cairo/cairo-features.h.cmake b/Libraries/3rd/cairo/cairo-features.h.cmake index 6c2845b43..a045c839e 100644 --- a/Libraries/3rd/cairo/cairo-features.h.cmake +++ b/Libraries/3rd/cairo/cairo-features.h.cmake @@ -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 diff --git a/Libraries/3rd/cairo/config.h.cmake b/Libraries/3rd/cairo/config.h.cmake index 1f56b0a34..89f03c8d0 100644 --- a/Libraries/3rd/cairo/config.h.cmake +++ b/Libraries/3rd/cairo/config.h.cmake @@ -38,6 +38,8 @@ #cmakedefine HAVE_ZLIB 1 +#define HAVE_CTIME_R 1 + #define SIZEOF_INT ${SIZEOF_INT} #define SIZEOF_LONG ${SIZEOF_LONG} diff --git a/Programs/MiKTeX/Console/Qt/CMakeLists.txt b/Programs/MiKTeX/Console/Qt/CMakeLists.txt index 9ec3c8278..7a8509d30 100644 --- a/Programs/MiKTeX/Console/Qt/CMakeLists.txt +++ b/Programs/MiKTeX/Console/Qt/CMakeLists.txt @@ -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() diff --git a/cmake/modules/InstallQtPlugin.cmake b/cmake/modules/InstallQtPlugin.cmake index cb1b971f4..68cd5fdb5 100644 --- a/cmake/modules/InstallQtPlugin.cmake +++ b/cmake/modules/InstallQtPlugin.cmake @@ -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)