Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 766294 | Differences between
and this patch

Collapse All | Expand All

(-)rstudio-2022.07.2-576-orig/src/cpp/session/CMakeLists.txt (-50 / +1 lines)
Lines 51-75 Link Here
51
51
52
endif()
52
endif()
53
53
54
55
# install pandoc
56
# - by default, we use quarto + quarto's bundled pandoc
57
# - if quarto is not enabled, use pandoc fallback
58
if(QUARTO_ENABLED)
59
   set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "${RSTUDIO_DEPENDENCIES_QUARTO_DIR}/bin/tools")
60
elseif(EXISTS "${RSTUDIO_TOOLS_ROOT}/pandoc/${PANDOC_VERSION}")
61
   set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "${RSTUDIO_TOOLS_ROOT}/pandoc/${PANDOC_VERSION}")
62
else()
63
   set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "${RSTUDIO_DEPENDENCIES_DIR}/pandoc/${PANDOC_VERSION}")
64
endif()
65
66
67
# validate our dependencies exist
54
# validate our dependencies exist
68
foreach(VAR RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR
55
foreach(VAR RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR)
69
            RSTUDIO_DEPENDENCIES_MATHJAX_DIR
70
            RSTUDIO_DEPENDENCIES_PANDOC_DIR
71
            RSTUDIO_DEPENDENCIES_QUARTO_DIR)
72
73
 
56
 
74
   # skip quarto if not enabled
57
   # skip quarto if not enabled
75
   if("${VAR}" STREQUAL "RSTUDIO_DEPENDENCIES_QUARTO_DIR" AND NOT QUARTO_ENABLED)
58
   if("${VAR}" STREQUAL "RSTUDIO_DEPENDENCIES_QUARTO_DIR" AND NOT QUARTO_ENABLED)
Lines 671-708 Link Here
671
   install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR}"
654
   install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR}"
672
           DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources")
655
           DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources")
673
656
674
   # install mathjax for local html preview
675
   install(DIRECTORY "${RSTUDIO_DEPENDENCIES_MATHJAX_DIR}"
676
           DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources")
677
678
   # install quarto (or pandoc if quarto disabled)
679
   if(QUARTO_ENABLED)
680
      # install some quarto folders into Resources, as needed
681
      if(APPLE)
682
         if (RSTUDIO_ELECTRON)
683
            install(DIRECTORY "${RSTUDIO_DEPENDENCIES_QUARTO_DIR}" 
684
                  DESTINATION "${RSTUDIO_INSTALL_RESOURCES}/app"
685
                  USE_SOURCE_PERMISSIONS)
686
         else()
687
            install(DIRECTORY "${RSTUDIO_DEPENDENCIES_QUARTO_DIR}"
688
                  DESTINATION "${RSTUDIO_INSTALL_BIN}"
689
                  USE_SOURCE_PERMISSIONS
690
                  PATTERN "*/share" EXCLUDE)
691
            install(DIRECTORY "${RSTUDIO_DEPENDENCIES_QUARTO_DIR}/share" 
692
                  DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/quarto"
693
                  USE_SOURCE_PERMISSIONS)
694
         endif()
695
      else()
696
         install(DIRECTORY "${RSTUDIO_DEPENDENCIES_QUARTO_DIR}"
697
               DESTINATION "${RSTUDIO_INSTALL_BIN}"
698
               USE_SOURCE_PERMISSIONS)
699
      endif()
700
   else()
701
      install(DIRECTORY "${RSTUDIO_DEPENDENCIES_PANDOC_DIR}/"
702
              DESTINATION "${RSTUDIO_INSTALL_BIN}/pandoc"
703
              USE_SOURCE_PERMISSIONS)
704
   endif()
705
706
   # install embedded packages
657
   # install embedded packages
707
   foreach(PKG ${RSTUDIO_EMBEDDED_PACKAGES})
658
   foreach(PKG ${RSTUDIO_EMBEDDED_PACKAGES})
708
      file(GLOB PKG_FILES "${RSTUDIO_DEPENDENCIES_DIR}/common/${PKG}*.tar.gz")
659
      file(GLOB PKG_FILES "${RSTUDIO_DEPENDENCIES_DIR}/common/${PKG}*.tar.gz")

Return to bug 766294