aboutsummaryrefslogtreecommitdiff
path: root/devel/RStudio/files/patch-CMakeGlobals.txt
diff options
context:
space:
mode:
Diffstat (limited to 'devel/RStudio/files/patch-CMakeGlobals.txt')
-rw-r--r--devel/RStudio/files/patch-CMakeGlobals.txt24
1 files changed, 21 insertions, 3 deletions
diff --git a/devel/RStudio/files/patch-CMakeGlobals.txt b/devel/RStudio/files/patch-CMakeGlobals.txt
index fa4da3d5e013..60af3c7c1151 100644
--- a/devel/RStudio/files/patch-CMakeGlobals.txt
+++ b/devel/RStudio/files/patch-CMakeGlobals.txt
@@ -1,6 +1,6 @@
---- CMakeGlobals.txt.orig 2020-01-23 23:30:24 UTC
+--- CMakeGlobals.txt.orig 2021-05-24 22:22:25 UTC
+++ CMakeGlobals.txt
-@@ -84,7 +84,7 @@ endif()
+@@ -118,7 +118,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)
@@ -9,7 +9,7 @@
find_program(GIT_EXECUTABLE git)
if(GIT_EXECUTABLE)
execute_process(
-@@ -95,6 +95,7 @@ if(NOT RSTUDIO_SESSION_WIN32 AND NOT RSTUDIO_GIT_REVIS
+@@ -129,6 +129,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()
@@ -17,3 +17,21 @@
# record these from Jenkins if available
if("$ENV{GIT_COMMIT}" STREQUAL "")
+@@ -238,14 +239,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)
+- 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()