You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
43 lines
2.0 KiB
43 lines
2.0 KiB
--- rstudio-1.3.959-orig/src/cpp/session/CMakeLists.txt 2020-05-19 04:11:10.000000000 +1000
|
|
+++ rstudio-1.3.959/src/cpp/session/CMakeLists.txt 2020-05-24 18:54:40.444955162 +1000
|
|
@@ -22,12 +22,6 @@
|
|
if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/dictionaries")
|
|
message(FATAL_ERROR "Dictionaries not found (re-run install-dependencies script to install)")
|
|
endif()
|
|
-if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax-27")
|
|
- message(FATAL_ERROR "Mathjax 2.7 not found (re-run install-dependencies script to install)")
|
|
-endif()
|
|
-if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc")
|
|
- message(FATAL_ERROR "pandoc not found (re-run install-dependencies script to install)")
|
|
-endif()
|
|
|
|
# verify embedded packages are available
|
|
foreach(PKG ${RSTUDIO_EMBEDDED_PACKAGES})
|
|
@@ -500,10 +494,6 @@
|
|
install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/dictionaries"
|
|
DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources")
|
|
|
|
- # install mathjax for local html preview
|
|
- install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax-27"
|
|
- DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources")
|
|
-
|
|
# icons for database connections
|
|
install(DIRECTORY "resources/connections"
|
|
DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources)
|
|
@@ -516,15 +506,6 @@
|
|
install(DIRECTORY "resources/dependencies"
|
|
DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources)
|
|
|
|
- # install pandoc
|
|
- set(PANDOC_VERSION "2.7.3" CACHE INTERNAL "Pandoc version")
|
|
-
|
|
- set(PANDOC_BIN "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc/${PANDOC_VERSION}")
|
|
- file(GLOB PANDOC_FILES "${PANDOC_BIN}/pandoc*")
|
|
- install(FILES ${PANDOC_FILES}
|
|
- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
|
|
- DESTINATION ${RSTUDIO_INSTALL_BIN}/pandoc)
|
|
-
|
|
# install embedded packages
|
|
foreach(PKG ${RSTUDIO_EMBEDDED_PACKAGES})
|
|
file(GLOB PKG_FILES "${RSTUDIO_DEPENDENCIES_DIR}/common/${PKG}*.tar.gz")
|