|
Lines 25-33
endif()
Link Here
|
| 25 |
if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax-26") |
25 |
if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax-26") |
| 26 |
message(FATAL_ERROR "Mathjax 2.6 not found (re-run install-dependencies script to install)") |
26 |
message(FATAL_ERROR "Mathjax 2.6 not found (re-run install-dependencies script to install)") |
| 27 |
endif() |
27 |
endif() |
| 28 |
if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc") |
|
|
| 29 |
message(FATAL_ERROR "pandoc not found (re-run install-dependencies script to install)") |
| 30 |
endif() |
| 31 |
# if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/rmarkdown") |
28 |
# if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/rmarkdown") |
| 32 |
# message(FATAL_ERROR "rmarkdown package not found (re-run install-dependencies script to install)") |
29 |
# message(FATAL_ERROR "rmarkdown package not found (re-run install-dependencies script to install)") |
| 33 |
# endif() |
30 |
# endif() |
|
Lines 35-56
if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DI
Link Here
|
| 35 |
message(FATAL_ERROR "rsconnect package not found (re-run install-dependencies script to install)") |
32 |
message(FATAL_ERROR "rsconnect package not found (re-run install-dependencies script to install)") |
| 36 |
endif() |
33 |
endif() |
| 37 |
|
34 |
|
| 38 |
# verify libclang is installed |
|
|
| 39 |
if(WIN32) |
| 40 |
set(LIBCLANG_VERSION "3.4") |
| 41 |
else() |
| 42 |
set(LIBCLANG_VERSION "3.5") |
| 43 |
endif() |
| 44 |
set(LIBCLANG_DIR "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/${LIBCLANG_VERSION}") |
| 45 |
if(NOT EXISTS "${LIBCLANG_DIR}") |
| 46 |
message(FATAL_ERROR "libclang ${LIBCLANG_VERSION} not found (re-run install-dependencies script to install)") |
| 47 |
endif() |
| 48 |
set(LIBCLANG_HEADERS_DIR "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/builtin-headers") |
| 49 |
if(NOT EXISTS "${LIBCLANG_HEADERS_DIR}") |
| 50 |
message(FATAL_ERROR "libclang builtin-headers not found (re-run install-dependencies script to install)") |
| 51 |
endif() |
| 52 |
|
| 53 |
|
| 54 |
# include files |
35 |
# include files |
| 55 |
file(GLOB_RECURSE SESSION_HEADER_FILES "*.h*") |
36 |
file(GLOB_RECURSE SESSION_HEADER_FILES "*.h*") |
| 56 |
|
37 |
|
|
Lines 462-474
if (NOT RSTUDIO_SESSION_WIN64)
Link Here
|
| 462 |
install(DIRECTORY "resources/connections" |
443 |
install(DIRECTORY "resources/connections" |
| 463 |
DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources) |
444 |
DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources) |
| 464 |
|
445 |
|
| 465 |
# install pandoc |
|
|
| 466 |
set(PANDOC_BIN "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc/1.19.2.1") |
| 467 |
file(GLOB PANDOC_FILES "${PANDOC_BIN}/pandoc*") |
| 468 |
install(FILES ${PANDOC_FILES} |
| 469 |
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE |
| 470 |
DESTINATION ${RSTUDIO_INSTALL_BIN}/pandoc) |
| 471 |
|
| 472 |
# install rmarkdown package |
446 |
# install rmarkdown package |
| 473 |
# file(GLOB RMARKDOWN_PACKAGE "${RSTUDIO_DEPENDENCIES_DIR}/common/rmarkdown*.tar.gz") |
447 |
# file(GLOB RMARKDOWN_PACKAGE "${RSTUDIO_DEPENDENCIES_DIR}/common/rmarkdown*.tar.gz") |
| 474 |
# install(FILES ${RMARKDOWN_PACKAGE} |
448 |
# install(FILES ${RMARKDOWN_PACKAGE} |
|
Lines 495-518
if (NOT RSTUDIO_SESSION_WIN64)
Link Here
|
| 495 |
install(DIRECTORY "resources/pagedtable" |
469 |
install(DIRECTORY "resources/pagedtable" |
| 496 |
DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources) |
470 |
DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources) |
| 497 |
|
471 |
|
| 498 |
# install libclang |
|
|
| 499 |
if(WIN32) |
| 500 |
file(GLOB LIBCLANG_32_FILES "${LIBCLANG_DIR}/x86/libclang.*") |
| 501 |
install(PROGRAMS ${LIBCLANG_32_FILES} |
| 502 |
DESTINATION ${RSTUDIO_INSTALL_BIN}/rsclang/x86) |
| 503 |
file(GLOB LIBCLANG_64_FILES "${LIBCLANG_DIR}/x86_64/libclang.*") |
| 504 |
install(PROGRAMS ${LIBCLANG_64_FILES} |
| 505 |
DESTINATION ${RSTUDIO_INSTALL_BIN}/rsclang/x86_64) |
| 506 |
else() |
| 507 |
file(GLOB_RECURSE LIBCLANG_FILES "${LIBCLANG_DIR}/libclang.*") |
| 508 |
install(PROGRAMS ${LIBCLANG_FILES} |
| 509 |
DESTINATION ${RSTUDIO_INSTALL_BIN}/rsclang) |
| 510 |
endif() |
| 511 |
|
| 512 |
# install libclang builtin-headers |
| 513 |
install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/builtin-headers" |
| 514 |
DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources/libclang") |
| 515 |
|
| 516 |
# install winpty on windows |
472 |
# install winpty on windows |
| 517 |
if(WIN32) |
473 |
if(WIN32) |
| 518 |
install(PROGRAMS "${WINPTY_BINDIR_32}/winpty.dll" |
474 |
install(PROGRAMS "${WINPTY_BINDIR_32}/winpty.dll" |
