diff --git a/CHANGELOG.txt b/CHANGELOG.txt index fa642731e..474f72552 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,5 +1,9 @@ CHANGE LOG: Zinc Library +v4.1.1 +Fix empty classifiers for Python packaging. +Drop support for OS X Mountain Lion and below (last released 2015). + v4.1.0 Fix optimisation with conditional field applying partially to elements' nodes. Region read with single time is ignored with a warning for field value types not supporting time sequence. diff --git a/CMakeLists.txt b/CMakeLists.txt index f74b5e821..f61cb737a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,7 +25,7 @@ if(POLICY CMP0086) endif() # This is the project name and shows up in IDEs -project(Zinc VERSION 4.1.0 LANGUAGES C CXX) +project(Zinc VERSION 4.1.1 LANGUAGES C CXX) # Set this to the development release or release candidate version. set(Zinc_DEVELOPER_VERSION "") diff --git a/tests/GTestChecks.cmake b/tests/GTestChecks.cmake index edabbb047..9161905a2 100644 --- a/tests/GTestChecks.cmake +++ b/tests/GTestChecks.cmake @@ -23,16 +23,7 @@ IF(NOT GTEST_SUCCESS) SET(GTEST_THREAD_LIBRARIES ${CMAKE_THREAD_LIBS_INIT}) ENDIF() - IF(APPLE) - EXEC_PROGRAM(uname ARGS -v OUTPUT_VARIABLE DARWIN_VERSION) - STRING(REGEX MATCH "[0-9]+" DARWIN_VERSION ${DARWIN_VERSION}) - #MESSAGE(STATUS "DARWIN_VERSION=${DARWIN_VERSION}") - #DARWIN version 13 = Mac 0SX 10.9 - IF(DARWIN_VERSION GREATER 12) - ADD_DEFINITIONS(-DGTEST_USE_OWN_TR1_TUPLE=1) - ENDIF () + ADD_DEFINITIONS(-DGTEST_USE_OWN_TR1_TUPLE=1) ENDIF() - -