diff options
Diffstat (limited to 'devel/RStudio/files/patch-CMakeGlobals.txt')
| -rw-r--r-- | devel/RStudio/files/patch-CMakeGlobals.txt | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/devel/RStudio/files/patch-CMakeGlobals.txt b/devel/RStudio/files/patch-CMakeGlobals.txt deleted file mode 100644 index 92ea09a5490e..000000000000 --- a/devel/RStudio/files/patch-CMakeGlobals.txt +++ /dev/null @@ -1,46 +0,0 @@ ---- CMakeGlobals.txt.orig 2022-12-03 07:38:59 UTC -+++ CMakeGlobals.txt -@@ -168,7 +168,7 @@ endif() - - # record git revision hash (cache it since we don't use this in development - # mode and we don't want it to force rebuilds there) --if(NOT RSTUDIO_SESSION_WIN32 AND NOT RSTUDIO_GIT_REVISION_HASH) -+if(FALSE AND NOT RSTUDIO_SESSION_WIN32 AND NOT RSTUDIO_GIT_REVISION_HASH) - find_program(GIT_EXECUTABLE git) - if(GIT_EXECUTABLE) - execute_process( -@@ -179,6 +179,7 @@ if(NOT RSTUDIO_SESSION_WIN32 AND NOT RSTUDIO_GIT_REVIS - SET(RSTUDIO_GIT_REVISION_HASH "${RSTUDIO_GIT_REVISION_HASH}" CACHE STRING "Git Revision Hash") - endif() - endif() -+SET(RSTUDIO_VERSION "${FREEBSD_RSTUDIO_VERSION}" CACHE STRING "FreeBSD RStudio version") - - # record these from Jenkins if available - if("$ENV{GIT_COMMIT}" STREQUAL "") -@@ -241,7 +242,7 @@ if(NOT DEFINED QUARTO_ENABLED) - set(QUARTO_ENABLED FALSE CACHE INTERNAL "") - else() - # enable by default -- set(QUARTO_ENABLED TRUE CACHE INTERNAL "") -+ set(QUARTO_ENABLED ${FREEBSD_QUARTO_ENABLED} CACHE INTERNAL "") - endif() - endif() - -@@ -334,14 +335,14 @@ else() - endif() - - # if the install prefix is /usr/local then tweak as appropriate --if(NOT DEFINED CMAKE_INSTALL_PREFIX) -+if(TRUE OR NOT DEFINED CMAKE_INSTALL_PREFIX) # force to set deeper CMAKE_INSTALL_PREFIX because many files are installed into its root - if(APPLE) - set(CMAKE_INSTALL_PREFIX "/Applications") - elseif(UNIX) - if(RSTUDIO_DESKTOP OR RSTUDIO_ELECTRON) -- set(CMAKE_INSTALL_PREFIX "/usr/local/lib/rstudio") -+ set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/lib/rstudio") - else() -- set(CMAKE_INSTALL_PREFIX "/usr/local/lib/rstudio-server") -+ set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/lib/rstudio-server") - endif() - endif() - endif() |
