diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 2e86bb22d..bbdc14ab5 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,5 +1,9 @@ CHANGE LOG: Zinc Library +v4.2.1 +Update minimum version of CMake required to 3.18. +CI infrastructure fixes. + v4.2.0 Fix bug for export of single element line to webGL. Fix undefined element field segfault. diff --git a/CMakeLists.txt b/CMakeLists.txt index 63baef598..0ba3813bf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,27 +5,18 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -cmake_minimum_required(VERSION 3.10.0) -cmake_policy(VERSION 3.10.0) +cmake_minimum_required(VERSION 3.18.0) +cmake_policy(VERSION 3.18.0) -if(POLICY CMP0072) - cmake_policy(SET CMP0072 NEW) -endif() - -if(POLICY CMP0074) - cmake_policy(SET CMP0074 NEW) -endif() - -if(POLICY CMP0078) - cmake_policy(SET CMP0078 NEW) -endif() - -if(POLICY CMP0086) - cmake_policy(SET CMP0086 NEW) -endif() +set(POLICIES CMP0072 CMP0074 CMP0078 CMP0086 CMP0126) +foreach(P ${POLICIES}) + if(POLICY ${P}) + cmake_policy(SET ${P} NEW) + endif() +endforeach() # This is the project name and shows up in IDEs -project(Zinc VERSION 4.2.0 LANGUAGES C CXX) +project(Zinc VERSION 4.2.1 LANGUAGES C CXX) # Set this to the development release or release candidate version. set(Zinc_VERSION_DEVELOPER "") diff --git a/cmake/ZincPackaging.cmake b/cmake/ZincPackaging.cmake index a6a11e075..2533cce16 100644 --- a/cmake/ZincPackaging.cmake +++ b/cmake/ZincPackaging.cmake @@ -42,7 +42,7 @@ ELSEIF( APPLE ) SET( CPACK_RESOURCE_FILE_WELCOME "${CMAKE_CURRENT_SOURCE_DIR}/distrib/osx/welcome.txt" ) LIST( LENGTH LENGTH_ARCHS CMAKE_OSX_ARCHITECTURES ) - SET( ZINC_ARCHITECTURE "universal" ) + SET( ZINC_ARCHITECTURE "${CMAKE_HOST_SYSTEM_PROCESSOR}" ) SET( CPACK_GENERATOR "TGZ" "productbuild" ) ELSEIF( UNIX ) # Preserve the CMAKE_INSTALL_PREFIX for the project and work with absolute install