aboutsummaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorMate Toth-Pal <mate.toth-pal@arm.com>2020-06-15 13:48:34 +0200
committerAnton Komlev <Anton.Komlev@arm.com>2020-07-08 20:07:41 +0000
commit955235a96ea78ea2196d3ea78eb7015bfdc6b00c (patch)
tree49f8b17ff587d5aba88c7f979a1086450ccc2dae /cmake
parente0e2d8433ab46ecde9e7b14cc244de86acf760bd (diff)
downloadtrusted-firmware-m-955235a96ea78ea2196d3ea78eb7015bfdc6b00c.tar.gz
Doc: Add changelog for 1.1 release
Create changelog document for 1.1 release and add it to the main changelog document. Add 1.1 release to readme.rst Update version number in tfm_version.h Update version number in Doxygen CMake files. Change-Id: Icb81ab1e5994228772884c7a1dcb878533dcfa33 Signed-off-by: Mate Toth-Pal <mate.toth-pal@arm.com>
Diffstat (limited to 'cmake')
-rw-r--r--cmake/Common/BuildDoxygenDoc.cmake2
-rw-r--r--cmake/Common/BuildSphinxDoc.cmake4
2 files changed, 3 insertions, 3 deletions
diff --git a/cmake/Common/BuildDoxygenDoc.cmake b/cmake/Common/BuildDoxygenDoc.cmake
index 79f536ecc..d1b7cb0e8 100644
--- a/cmake/Common/BuildDoxygenDoc.cmake
+++ b/cmake/Common/BuildDoxygenDoc.cmake
@@ -85,7 +85,7 @@ if (NOT NODOC)
#Version ID of TF-M.
#TODO: this shall not be hard-coded here. A process need to defined for
# versioning the document (and TF-M).
- set(DOXYCFG_TFM_VERSION "v1.0")
+ set(DOXYCFG_TFM_VERSION "v1.1")
#Using add_custom_command allows CMake to generate proper clean commands
#for document generation.
diff --git a/cmake/Common/BuildSphinxDoc.cmake b/cmake/Common/BuildSphinxDoc.cmake
index 65487446a..ab08319c3 100644
--- a/cmake/Common/BuildSphinxDoc.cmake
+++ b/cmake/Common/BuildSphinxDoc.cmake
@@ -84,8 +84,8 @@ if (NOT SPHINX_NODOC)
#Version ID of TF-M.
#TODO: this shall not be hard-coded here. We need a process to define the
# version number of the document (and TF-M).
- set(SPHINXCFG_TFM_VERSION "v1.0")
- set(SPHINXCFG_TFM_VERSION_FULL "Version 1.0")
+ set(SPHINXCFG_TFM_VERSION "v1.1")
+ set(SPHINXCFG_TFM_VERSION_FULL "Version 1.1")
get_filename_component(_NDX_FILE_DIR ${SPHINX_CONFIGURED_INDEX_FILE} DIRECTORY )