diff --git a/CMakeGlobals.txt b/CMakeGlobals.txt index ea70424832e..c558be128d3 100644 --- a/CMakeGlobals.txt +++ b/CMakeGlobals.txt @@ -40,8 +40,6 @@ else() endif() set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") -set(RSTUDIO_RELEASE_NAME "Wax Begonia") - string(TIMESTAMP CPACK_COPYRIGHT_YEAR "%Y") string(TIMESTAMP CPACK_BUILD_DATE "%Y-%m-%d") diff --git a/CMakeLists.txt b/CMakeLists.txt index 97ff332bbd3..1f1f395fe49 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,12 @@ # cmake_minimum_required(VERSION 3.4.3) -project (RStudio) + +# release name +include(CMakeRelease.txt) + +# project name +project("RStudio [${RSTUDIO_RELEASE_NAME}]") # set compiler include(CMakeCompiler.txt) diff --git a/CMakeRelease.txt b/CMakeRelease.txt new file mode 100644 index 00000000000..43a2bb0c670 --- /dev/null +++ b/CMakeRelease.txt @@ -0,0 +1,16 @@ +# CMakeRelease.txt +# +# Copyright (C) 2009-20 by RStudio, PBC +# +# Unless you have received this program directly from RStudio pursuant +# to the terms of a commercial license agreement with RStudio, then +# this program is licensed to you under the terms of version 3 of the +# GNU Affero General Public License. This program is distributed WITHOUT +# ANY EXPRESS OR IMPLIED WARRANTY, INCLUDING THOSE OF NON-INFRINGEMENT, +# MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Please refer to the +# AGPL (http://www.gnu.org/licenses/agpl-3.0.txt) for more details. +# + +file(STRINGS "${CMAKE_CURRENT_LIST_DIR}/RELEASE" RSTUDIO_RELEASE_NAME LIMIT_COUNT 1) +set(RSTUDIO_RELEASE_NAME "${RSTUDIO_RELEASE_NAME}" CACHE STRING "RStudio release name") + diff --git a/RELEASE b/RELEASE new file mode 100644 index 00000000000..ac69acc09cd --- /dev/null +++ b/RELEASE @@ -0,0 +1 @@ +Wax Begonia diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt index 210bac0c2ca..d36d93b0981 100644 --- a/src/cpp/CMakeLists.txt +++ b/src/cpp/CMakeLists.txt @@ -16,8 +16,13 @@ # set minimum version cmake_minimum_required(VERSION 3.4.3) -project (RSTUDIO_CPP) +# read release name +include("${CMAKE_CURRENT_SOURCE_DIR}/../../CMakeRelease.txt") +# set project name +project("RStudio [${RSTUDIO_RELEASE_NAME}]") + +# tools for reading executable file pre-requisites include(GetPrerequisites) # set compiler