Changeset View
Changeset View
Standalone View
Standalone View
head/devel/RStudio/files/patch-src_cpp_session_CMakeLists.txt
| Property | Old Value | New Value |
|---|---|---|
| fbsd:nokeywords | null | yes \ No newline at end of property |
| svn:eol-style | null | native \ No newline at end of property |
| svn:mime-type | null | text/plain \ No newline at end of property |
| --- src/cpp/session/CMakeLists.txt.orig 2017-11-16 21:40:37 UTC | |||||
| +++ src/cpp/session/CMakeLists.txt | |||||
| @@ -25,9 +25,9 @@ endif() | |||||
| if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax-26") | |||||
| message(FATAL_ERROR "Mathjax 2.6 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() | |||||
| +#if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc") | |||||
| +# message(FATAL_ERROR "pandoc not found (re-run install-dependencies script to install)") | |||||
| +#endif() | |||||
| # we often install embedded versions of these packages but don't do so currently | |||||
| @@ -39,19 +39,19 @@ endif() | |||||
| # endif() | |||||
| # verify libclang is installed | |||||
| -if(WIN32) | |||||
| - set(LIBCLANG_VERSION "3.4") | |||||
| -else() | |||||
| - set(LIBCLANG_VERSION "3.5") | |||||
| -endif() | |||||
| -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() | |||||
| +#if(WIN32) | |||||
| +# set(LIBCLANG_VERSION "3.4") | |||||
| +#else() | |||||
| +# set(LIBCLANG_VERSION "3.5") | |||||
| +#endif() | |||||
| +set(LIBCLANG_DIR ${CMAKE_INSTALL_PREFIX}) | |||||
| +#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 "${CMAKE_INSTALL_PREFIX}/include") | |||||
| +#if(NOT EXISTS "${LIBCLANG_HEADERS_DIR}") | |||||
| +# message(FATAL_ERROR "libclang builtin-headers not found (re-run install-dependencies script to install)") | |||||
| +#endif() | |||||
| # include files | |||||
| @@ -360,6 +360,9 @@ endif() | |||||
| # define executable | |||||
| add_executable(rsession ${SESSION_SOURCE_FILES} ${SESSION_HEADER_FILES}) | |||||
| +# additional libraries | |||||
| +target_link_libraries(rsession -L${FREEBSD_LIBDIR} -linotify) | |||||
| + | |||||
| # skip libR RPATH at development time | |||||
| if(RSTUDIO_DEVELOPMENT OR RSTUDIO_RUN_IN_PLACE) | |||||
| set_target_properties(rsession PROPERTIES SKIP_BUILD_RPATH TRUE) | |||||
| @@ -466,11 +469,11 @@ if (NOT RSTUDIO_SESSION_WIN64) | |||||
| DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources) | |||||
| # install pandoc | |||||
| - set(PANDOC_BIN "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc/1.19.2.1") | |||||
| - 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) | |||||
| + #set(PANDOC_BIN "${}/common/pandoc/1.19.2.1") | |||||
| + #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 rmarkdown package | |||||
| # file(GLOB RMARKDOWN_PACKAGE "${RSTUDIO_DEPENDENCIES_DIR}/common/rmarkdown*.tar.gz") | |||||
| @@ -511,14 +514,14 @@ if (NOT RSTUDIO_SESSION_WIN64) | |||||
| install(PROGRAMS ${LIBCLANG_64_FILES} | |||||
| DESTINATION ${RSTUDIO_INSTALL_BIN}/rsclang/x86_64) | |||||
| else() | |||||
| - file(GLOB_RECURSE LIBCLANG_FILES "${LIBCLANG_DIR}/libclang.*") | |||||
| - install(PROGRAMS ${LIBCLANG_FILES} | |||||
| - DESTINATION ${RSTUDIO_INSTALL_BIN}/rsclang) | |||||
| + #file(GLOB_RECURSE LIBCLANG_FILES "${LIBCLANG_DIR}/libclang.*") | |||||
| + #install(PROGRAMS ${LIBCLANG_FILES} | |||||
| + # DESTINATION ${RSTUDIO_INSTALL_BIN}/rsclang) | |||||
| endif() | |||||
| # install libclang builtin-headers | |||||
| - install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/builtin-headers" | |||||
| - DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources/libclang") | |||||
| + #install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/builtin-headers" | |||||
| + # DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources/libclang") | |||||
| # install winpty on windows | |||||
| if(WIN32) | |||||