From 8cbbafdc016611b5138beab6e0a8b6ef6057b33c Mon Sep 17 00:00:00 2001 From: Enrico Bertolazzi Date: Mon, 23 Nov 2020 22:38:21 +0100 Subject: [PATCH] updated submodules and Rakefile_conf.rb --- CMakeLists.txt | 2 +- Rakefile_conf.rb | 3 ++- submodules/GenericContainer | 2 +- submodules/Utils | 2 +- submodules/quarticRootsFlocke | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7ecb6d4e..766476e4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,7 @@ # # ############################################################################ -cmake_minimum_required(VERSION 2.8) +CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12) SET( CMAKE_VERBOSE_MAKEFILE OFF ) SET( CMAKE_INSTALL_MESSAGE NEVER ) diff --git a/Rakefile_conf.rb b/Rakefile_conf.rb index dae60424..bef9ec85 100755 --- a/Rakefile_conf.rb +++ b/Rakefile_conf.rb @@ -11,10 +11,11 @@ PARALLEL = '' QUIET = '' else + require 'etc' cmakeversion = %x( cmake --version ).scan(/\d+\.\d+\.\d+/).last mm = cmakeversion.split('.'); if mm[0].to_i > 3 || (mm[0].to_i == 3 && mm[1].to_i >= 12) then - PARALLEL = '--parallel 8 ' + PARALLEL = "--parallel #{Etc.nprocessors} " QUIET = '-- --quiet ' else PARALLEL = '' diff --git a/submodules/GenericContainer b/submodules/GenericContainer index 54d942ea..063065b2 160000 --- a/submodules/GenericContainer +++ b/submodules/GenericContainer @@ -1 +1 @@ -Subproject commit 54d942ea3e9524282421eb246c6272e0bce544eb +Subproject commit 063065b231afdfc5e230a2807cd16a994f57fc58 diff --git a/submodules/Utils b/submodules/Utils index 8ab470ec..0a820ccd 160000 --- a/submodules/Utils +++ b/submodules/Utils @@ -1 +1 @@ -Subproject commit 8ab470ec486d9178c897a256d6d33dfef8209fa3 +Subproject commit 0a820ccdf565ae0b937e0b25bdc71aa6f7050d05 diff --git a/submodules/quarticRootsFlocke b/submodules/quarticRootsFlocke index 458b526b..bc377b5f 160000 --- a/submodules/quarticRootsFlocke +++ b/submodules/quarticRootsFlocke @@ -1 +1 @@ -Subproject commit 458b526bab753a3b535d5f6bae96ac98bd177148 +Subproject commit bc377b5fc3a794db06473495e0d25226e45c9886