Skip to content

Commit

Permalink
Release 4.2.1-rc.1.
Browse files Browse the repository at this point in the history
  • Loading branch information
dependabot-abi committed Dec 17, 2024
1 parent e067bca commit f38d959
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 19 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
27 changes: 9 additions & 18 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 "")
Expand Down
2 changes: 1 addition & 1 deletion cmake/ZincPackaging.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit f38d959

Please sign in to comment.