diff options
Diffstat (limited to 'devel/RStudio/files/patch-src_cpp_session_CMakeLists.txt')
| -rw-r--r-- | devel/RStudio/files/patch-src_cpp_session_CMakeLists.txt | 133 |
1 files changed, 54 insertions, 79 deletions
diff --git a/devel/RStudio/files/patch-src_cpp_session_CMakeLists.txt b/devel/RStudio/files/patch-src_cpp_session_CMakeLists.txt index a0ed7d4a0034..ec905847548a 100644 --- a/devel/RStudio/files/patch-src_cpp_session_CMakeLists.txt +++ b/devel/RStudio/files/patch-src_cpp_session_CMakeLists.txt @@ -1,74 +1,57 @@ ---- src/cpp/session/CMakeLists.txt.orig 2021-05-24 22:22:25 UTC +--- src/cpp/session/CMakeLists.txt.orig 2022-07-06 19:59:49 UTC +++ src/cpp/session/CMakeLists.txt -@@ -24,7 +24,7 @@ set(PANDOC_VERSION "2.11.4" CACHE INTERNAL "Pandoc ver - if(WIN32) - set(RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR "${RSTUDIO_DEPENDENCIES_DIR}/common/dictionaries") - set(RSTUDIO_DEPENDENCIES_MATHJAX_DIR "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax-27") -- set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc/${PANDOC_VERSION}") -+ #set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc/${PANDOC_VERSION}") - else() +@@ -55,19 +55,19 @@ 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() ++#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() - # indirection to help build machine find these libraries? -@@ -40,17 +40,18 @@ else() - set(RSTUDIO_DEPENDENCIES_MATHJAX_DIR "${RSTUDIO_DEPENDENCIES_DIR}/mathjax-27") - endif() -- if(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() -+ #if(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() - - endif() + # validate our dependencies exist + foreach(VAR RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR + RSTUDIO_DEPENDENCIES_MATHJAX_DIR +- RSTUDIO_DEPENDENCIES_PANDOC_DIR ++ #RSTUDIO_DEPENDENCIES_PANDOC_DIR + RSTUDIO_DEPENDENCIES_QUARTO_DIR) - foreach(DEP "${RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR}" - "${RSTUDIO_DEPENDENCIES_MATHJAX_DIR}" -- "${RSTUDIO_DEPENDENCIES_PANDOC_DIR}") -+ #"${RSTUDIO_DEPENDENCIES_PANDOC_DIR}" -+) - if(NOT EXISTS "${DEP}") - message(FATAL_ERROR "${DEP} not found (re-run install-dependencies script to install") - endif() -@@ -65,19 +66,19 @@ foreach(PKG ${RSTUDIO_EMBEDDED_PACKAGES}) + +@@ -95,13 +95,13 @@ foreach(PKG ${RSTUDIO_EMBEDDED_PACKAGES}) endforeach() # verify libclang is installed (Windows only) -if(WIN32) -- set(LIBCLANG_VERSION "5.0.2") +- set(LIBCLANG_VERSION "13.0.1") - set(LIBCLANG_DIR "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/${LIBCLANG_VERSION}") - if(NOT EXISTS "${LIBCLANG_DIR}") - message(FATAL_ERROR "libclang ${LIBCLANG_VERSION} not found (re-run install-dependencies script to install)") - endif() +-endif() +#if(WIN32) -+# set(LIBCLANG_VERSION "5.0.2") ++# set(LIBCLANG_VERSION "13.0.1") +# set(LIBCLANG_DIR "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/${LIBCLANG_VERSION}") +# if(NOT EXISTS "${LIBCLANG_DIR}") +# message(FATAL_ERROR "libclang ${LIBCLANG_VERSION} not found (re-run install-dependencies script to install)") +# endif() -+# -+# set(LIBCLANG_HEADERS_DIR "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/builtin-headers") -+# if(NOT EXISTS "${LIBCLANG_HEADERS_DIR}") -+# message(FATAL_ERROR "libclang builtin-headers not found (re-run install-dependencies script to install)") -+# endif() +#endif() -- set(LIBCLANG_HEADERS_DIR "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/builtin-headers") -- if(NOT EXISTS "${LIBCLANG_HEADERS_DIR}") -- message(FATAL_ERROR "libclang builtin-headers not found (re-run install-dependencies script to install)") -- endif() --endif() -- # include files file(GLOB_RECURSE SESSION_HEADER_FILES "*.h*") +@@ -528,6 +528,9 @@ else() -@@ -444,6 +445,9 @@ add_stripped_executable( - ${SESSION_SOURCE_FILES} - ${SESSION_HEADER_FILES}) + endif() +# additional libraries +target_link_libraries(rsession -L${FREEBSD_LIBDIR} -linotify -lprocstat) @@ -76,22 +59,22 @@ # skip libR RPATH at development time if(RSTUDIO_DEVELOPMENT OR RSTUDIO_RUN_IN_PLACE) set_target_properties(rsession PROPERTIES SKIP_BUILD_RPATH TRUE) -@@ -579,10 +583,10 @@ if(NOT RSTUDIO_SESSION_WIN32 AND NOT RSESSION_ALTERNAT - DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources") - - # install pandoc -- file(GLOB PANDOC_FILES "${RSTUDIO_DEPENDENCIES_PANDOC_DIR}/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") -+ #file(GLOB PANDOC_FILES "${RSTUDIO_DEPENDENCIES_PANDOC_DIR}/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") +@@ -697,10 +700,10 @@ if(NOT RSTUDIO_SESSION_WIN32 AND NOT RSESSION_ALTERNAT + DESTINATION "${RSTUDIO_INSTALL_BIN}" + USE_SOURCE_PERMISSIONS) + endif() +- else() +- install(DIRECTORY "${RSTUDIO_DEPENDENCIES_PANDOC_DIR}/" +- DESTINATION "${RSTUDIO_INSTALL_BIN}/pandoc" +- USE_SOURCE_PERMISSIONS) ++ #else() ++ #install(DIRECTORY "${RSTUDIO_DEPENDENCIES_PANDOC_DIR}/" ++ # DESTINATION "${RSTUDIO_INSTALL_BIN}/pandoc" ++ # USE_SOURCE_PERMISSIONS) + endif() # install embedded packages - foreach(PKG ${RSTUDIO_EMBEDDED_PACKAGES}) -@@ -622,18 +626,18 @@ if(NOT RSTUDIO_SESSION_WIN32 AND NOT RSESSION_ALTERNAT +@@ -741,14 +744,14 @@ if(NOT RSTUDIO_SESSION_WIN32 AND NOT RSESSION_ALTERNAT DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources) # install libclang @@ -102,23 +85,15 @@ - file(GLOB LIBCLANG_64_FILES "${LIBCLANG_DIR}/x86_64/*") - install(PROGRAMS ${LIBCLANG_64_FILES} - DESTINATION ${RSTUDIO_INSTALL_BIN}/rsclang/x86_64) -- -- # install libclang builtin-headers -- install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/builtin-headers" -- DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources/libclang") - endif() -+# if(WIN32) -+# file(GLOB LIBCLANG_32_FILES "${LIBCLANG_DIR}/x86/*") -+# install(PROGRAMS ${LIBCLANG_32_FILES} -+# DESTINATION ${RSTUDIO_INSTALL_BIN}/rsclang/x86) -+# file(GLOB LIBCLANG_64_FILES "${LIBCLANG_DIR}/x86_64/*") -+# install(PROGRAMS ${LIBCLANG_64_FILES} -+# DESTINATION ${RSTUDIO_INSTALL_BIN}/rsclang/x86_64) -+# -+# # install libclang builtin-headers -+# install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/builtin-headers" -+# DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources/libclang") -+# endif() ++ #if(WIN32) ++ # file(GLOB LIBCLANG_32_FILES "${LIBCLANG_DIR}/x86/*") ++ # install(PROGRAMS ${LIBCLANG_32_FILES} ++ # DESTINATION ${RSTUDIO_INSTALL_BIN}/rsclang/x86) ++ # file(GLOB LIBCLANG_64_FILES "${LIBCLANG_DIR}/x86_64/*") ++ # install(PROGRAMS ${LIBCLANG_64_FILES} ++ # DESTINATION ${RSTUDIO_INSTALL_BIN}/rsclang/x86_64) ++ #endif() # install winpty on windows if(WIN32) |