Merge pull request #1403 from basvodde/master

basvodde · web-flow · commit 67d2dfd41e13 · 2020-05-27T18:59:41.000+08:00
Changed version to 4.0
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,7 @@
 project(CppUTest)
 
-set(CppUTest_version_major 3)
-set(CppUTest_version_minor 8)
+set(CppUTest_version_major 4)
+set(CppUTest_version_minor 0)
 
 # 2.6.3 is needed for ctest support
 # 3.1 is needed for target_sources
diff --git a/build/cmake_package_files/CppUTestConfigVersion.cmake b/build/cmake_package_files/CppUTestConfigVersion.cmake
@@ -7,14 +7,14 @@
 # PACKAGE_VERSION_COMPATIBLE if the current version is >= requested version,
 # but only if the requested major version is the same as the current one.
 # The variable CVF_VERSION must be set before calling configure_file().
-set(PACKAGE_VERSION "3.8")
+set(PACKAGE_VERSION "4.0")
 if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
   set(PACKAGE_VERSION_COMPATIBLE FALSE)
 else()
-  if("3.8" MATCHES "^([0-9]+)\\.")
+  if("4.0" MATCHES "^([0-9]+)\\.")
     set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
   else()
-    set(CVF_VERSION_MAJOR "3.8")
+    set(CVF_VERSION_MAJOR "4.0")
   endif()
   if(PACKAGE_FIND_VERSION_MAJOR STREQUAL CVF_VERSION_MAJOR)
     set(PACKAGE_VERSION_COMPATIBLE TRUE)
diff --git a/configure.ac b/configure.ac
@@ -1,6 +1,6 @@
 
 AC_PREREQ([2.68])
-AC_INIT([CppUTest], [3.8], [https://github.com/cpputest/cpputest])
+AC_INIT([CppUTest], [4.0], [https://github.com/cpputest/cpputest])
 AC_CONFIG_AUX_DIR([.])
 AM_INIT_AUTOMAKE([subdir-objects])
 AC_CONFIG_SRCDIR([src/CppUTest/Utest.cpp])
