updated submodules and Rakefile_conf.rb

ebertolazzi · Nov 23, 2020 · 8cbbafd · 8cbbafd
1 parent 9c51428
commit 8cbbafd
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git 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
@@ -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
diff --git a/submodules/Utils b/submodules/Utils
diff --git a/submodules/quarticRootsFlocke b/submodules/quarticRootsFlocke
+1 −1		CMakeLists.txt
+2 −1		Rakefile_conf.rb
+1 −1		third_parties/Lua/CMakeLists.txt