--- CMakeGlobals.txt.orig 2022-02-16 19:26:03 UTC +++ CMakeGlobals.txt @@ -159,7 +159,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( @@ -170,6 +170,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 "") @@ -223,7 +224,7 @@ if(LINUX AND UNAME_M STREQUAL aarch64) set(QUARTO_ENABLED FALSE CACHE INTERNAL "") else() # enable by default - set(QUARTO_ENABLED TRUE CACHE INTERNAL "") + set(QUARTO_ENABLED ${FREEBSD_QUARTO_ENABLED}) add_definitions(-DQUARTO_ENABLED) endif() @@ -298,14 +299,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()