--- rstudio-2022.07.2-576-orig/src/cpp/session/CMakeLists.txt 2022-08-31 23:09:53.000000000 +1000 +++ rstudio-2022.07.2-576/src/cpp/session/CMakeLists.txt 2022-10-10 09:29:39.492945698 +1100 @@ -51,25 +51,8 @@ endif() - -# install pandoc -# - by default, we use quarto + quarto's bundled pandoc -# - if quarto is not enabled, use pandoc fallback -if(QUARTO_ENABLED) - set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "${RSTUDIO_DEPENDENCIES_QUARTO_DIR}/bin/tools") -elseif(EXISTS "${RSTUDIO_TOOLS_ROOT}/pandoc/${PANDOC_VERSION}") - set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "${RSTUDIO_TOOLS_ROOT}/pandoc/${PANDOC_VERSION}") -else() - set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "${RSTUDIO_DEPENDENCIES_DIR}/pandoc/${PANDOC_VERSION}") -endif() - - # validate our dependencies exist -foreach(VAR RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR - RSTUDIO_DEPENDENCIES_MATHJAX_DIR - RSTUDIO_DEPENDENCIES_PANDOC_DIR - RSTUDIO_DEPENDENCIES_QUARTO_DIR) - +foreach(VAR RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR) # skip quarto if not enabled if("${VAR}" STREQUAL "RSTUDIO_DEPENDENCIES_QUARTO_DIR" AND NOT QUARTO_ENABLED) @@ -671,38 +654,6 @@ install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR}" DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources") - # install mathjax for local html preview - install(DIRECTORY "${RSTUDIO_DEPENDENCIES_MATHJAX_DIR}" - DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources") - - # install quarto (or pandoc if quarto disabled) - if(QUARTO_ENABLED) - # install some quarto folders into Resources, as needed - if(APPLE) - if (RSTUDIO_ELECTRON) - install(DIRECTORY "${RSTUDIO_DEPENDENCIES_QUARTO_DIR}" - DESTINATION "${RSTUDIO_INSTALL_RESOURCES}/app" - USE_SOURCE_PERMISSIONS) - else() - install(DIRECTORY "${RSTUDIO_DEPENDENCIES_QUARTO_DIR}" - DESTINATION "${RSTUDIO_INSTALL_BIN}" - USE_SOURCE_PERMISSIONS - PATTERN "*/share" EXCLUDE) - install(DIRECTORY "${RSTUDIO_DEPENDENCIES_QUARTO_DIR}/share" - DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/quarto" - USE_SOURCE_PERMISSIONS) - endif() - else() - install(DIRECTORY "${RSTUDIO_DEPENDENCIES_QUARTO_DIR}" - DESTINATION "${RSTUDIO_INSTALL_BIN}" - USE_SOURCE_PERMISSIONS) - endif() - else() - install(DIRECTORY "${RSTUDIO_DEPENDENCIES_PANDOC_DIR}/" - DESTINATION "${RSTUDIO_INSTALL_BIN}/pandoc" - USE_SOURCE_PERMISSIONS) - endif() - # install embedded packages foreach(PKG ${RSTUDIO_EMBEDDED_PACKAGES}) file(GLOB PKG_FILES "${RSTUDIO_DEPENDENCIES_DIR}/common/${PKG}*.tar.gz")