Skip to content

Commit

Permalink
updated Rakefile_conf.rb
Browse files Browse the repository at this point in the history
  • Loading branch information
ebertolazzi committed Nov 23, 2020
1 parent 458b526 commit bc377b5
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 )

Expand Down
3 changes: 2 additions & 1 deletion Rakefile_conf.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ''
Expand Down

0 comments on commit bc377b5

Please sign in to comment.