Merge branch 'master' into backup3

kimwalisch · Jan 7, 2021 · d49cb8a · d49cb8a
2 parents 9db0f70 + 0f4fc60
commit d49cb8a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.4)
+cmake_minimum_required(VERSION 3.4...3.19)
 project(primecount CXX)
 set(PRIMECOUNT_VERSION_MAJOR 6)
 set(PRIMECOUNT_VERSION_MINOR 2)

diff --git a/ChangeLog b/ChangeLog
@@ -1,4 +1,4 @@
-Changes in primecount-6.2, 2020-12-15
+Changes in primecount-6.2, 2021-01-04
 
   The sieving algorithm has been improved by annotating branches
   with likely/unlikely and __builtin_unreachable(). This improves

diff --git a/lib/primesieve/CMakeLists.txt b/lib/primesieve/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.4)
+cmake_minimum_required(VERSION 3.4...3.19)
 project(primesieve CXX)
 set(PRIMESIEVE_VERSION "7.6")
 set(PRIMESIEVE_SOVERSION "9.6.0")

diff --git a/scripts/build_mingw64.sh b/scripts/build_mingw64.sh
@@ -132,8 +132,8 @@ cp primecount-backup-$VERSION-win-x64.zip ..
 
 echo ""
 echo "Testing:"
-./primecount 1e15
-./primecount 1e15
+./primecount 1e17 --time
+./primecount 1e17
 cd ..
 
 ####################################################################