ADD: merged 'ndar' branch changes.

git-svn-id: https://www.nitrc.org/svn/cmtk/trunk@5455 42a5c34f-2066-0410-bec5-ba365beb4995
jefferis · Nov 6, 2022 · 81f92c4 · 81f92c4
1 parent f068b48
commit 81f92c4
Show file tree

Hide file tree

Showing 9 changed files with 1,523 additions and 1,310 deletions.
diff --git a/core/CHANGELOG b/core/CHANGELOG
@@ -1,3 +1,10 @@
+Release CMTK-3.3.2 (2022-11-06):
+
+(r5445) Merged 'ndar' branch:
+        * Support valid XML output
+        * Addition of additional DICOM values which are required to support 
+          submission to NIH NDA.
+
 Release CMTK-3.3.1p2 (2021-03-27):
 
 (r5443) Fixed: compilation errors using C++17.

diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
@@ -1,7 +1,7 @@
 ##
 ##  Copyright 1997-2010 Torsten Rohlfing
 ##
-##  Copyright 2004-2014 SRI International
+##  Copyright 2004-2014, 2022 SRI International
 ##
 ##  Copyright 2015, 2016 Google, Inc.
 ##
@@ -35,7 +35,7 @@
 ## It may have evolved away since then, however.
 ##
 
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)
 SET(CMAKE_LEGACY_CYGWIN_WIN32 0) # Remove when CMake >= 2.8.4 is required
 
 IF(COMMAND cmake_policy)
@@ -46,7 +46,7 @@ SET(CMAKE_OVERRIDE_COMPILER_MISMATCH 1)
 PROJECT(CMTK)
 SET(CMTK_VERSION_MAJOR "3")
 SET(CMTK_VERSION_MINOR "3")
-SET(CMTK_VERSION_PATCH "1p2")
+SET(CMTK_VERSION_PATCH "2")
 
 SET(CMTK_VERSION_STRING "${CMTK_VERSION_MAJOR}.${CMTK_VERSION_MINOR}.${CMTK_VERSION_PATCH}")