modified compilation of debug version of the library

ebertolazzi · Dec 5, 2019 · 7a24c23 · 7a24c23
1 parent d0bf1bc
commit 7a24c23
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/Rakefile b/Rakefile
@@ -81,12 +81,11 @@ task :build_win, [:year, :bits] do |t, args|
   if COMPILE_DEBUG then
     sh cmake_cmd + ' -DCMAKE_BUILD_TYPE:VAR=Debug --loglevel=WARNING ..'
     sh 'cmake --build . --config Debug --target install '+PARALLEL+QUIET
+  else
+    sh cmake_cmd + ' -DCMAKE_BUILD_TYPE:VAR=Release --loglevel=WARNING ..'
+    sh 'cmake  --build . --config Release  --target install '+PARALLEL+QUIET
   end
-
-  sh cmake_cmd + ' -DCMAKE_BUILD_TYPE:VAR=Release --loglevel=WARNING ..'
-  sh 'cmake  --build . --config Release  --target install '+PARALLEL+QUIET
   FileUtils.cd '..'
-
 end
 
 desc 'compile for OSX'
@@ -114,9 +113,10 @@ task :build_osx do
   if COMPILE_DEBUG then
     sh cmake_cmd + ' -DCMAKE_BUILD_TYPE:VAR=Debug --loglevel=WARNING ..'
     sh 'cmake --build . --config Debug --target install '+PARALLEL+QUIET
+  else
+    sh cmake_cmd + ' -DCMAKE_BUILD_TYPE:VAR=Release --loglevel=WARNING ..'
+    sh 'cmake --build . --config Release --target install '+PARALLEL+QUIET
   end
-  sh cmake_cmd + ' -DCMAKE_BUILD_TYPE:VAR=Release --loglevel=WARNING ..'
-  sh 'cmake --build . --config Release --target install '+PARALLEL+QUIET
   FileUtils.cd '..'
 end
 

diff --git a/Rakefile_conf.rb b/Rakefile_conf.rb
@@ -1,3 +1,8 @@
-COMPILE_DEBUG      = false
-COMPILE_DYNAMIC    = false
-COMPILE_EXECUTABLE = false
+# check for a conf file on a upper directory
+if Dir.exist?('../Rakefile_conf.rb') then
+  require_relative '../Rakefile_conf.rb'
+else
+  COMPILE_DEBUG      = false
+  COMPILE_DYNAMIC    = false
+  COMPILE_EXECUTABLE = false
+end