]> Creatis software - creaToolsTools.git/commitdiff
#3237 creaToolsTools Feature New Normal - Compile with openmp creaVtk creaMaracasVisu
authorEduardo DAVILA <davila@ei-ed-606.creatis.insa-lyon.fr>
Mon, 18 Mar 2019 15:45:27 +0000 (16:45 +0100)
committerEduardo DAVILA <davila@ei-ed-606.creatis.insa-lyon.fr>
Mon, 18 Mar 2019 15:45:27 +0000 (16:45 +0100)
Install_mingw64/Install_CreaTools/scripts/creaMaracasVariables.bat
Install_mingw64/Install_CreaTools/scripts/creaVtkVariables.bat
Linux/scripts/creaVtkVariables.sh

index 44f47a495504a9f42bcdf48c5a9e6ccb4c591e72..23aab2b5a9c376d0823080f29bcd46ef964216d6 100644 (file)
@@ -54,7 +54,7 @@ IF %4==Debug (
 ::%cmakeBin%  -D BUILD_BBTK_PACKAGE_creaMaracasVisu_DOXYGEN_DOC:BOOL=%3 CMakeCache.txt
 ::%cmakeBin%  CMakeCache.txt
 
-%cmakeBin% -D CMAKE_CXX_FLAGS:STRING=/openmp
+%cmakeBin% -D CMAKE_CXX_FLAGS:STRING=-openmp
 %cmakeBin%  -D crea_DIR:PATH=%1\c_%buildtype%%platforme%\ci CMakeCache.txt
 %cmakeBin%  -D BBTK_DIR:PATH=%1\c_%buildtype%%platforme%\ci CMakeCache.txt
 %cmakeBin%  -D BUILD_BBTK_PACKAGE_creaMaracasVisu:BOOL=ON -D creaMaracasVisu_DOC:BOOL=%3 CMakeCache.txt
index b650848db009f7ad5adc926200c87d72abed0fdb..8e85bbb315d5a1d058354ccc7ccdb8c148284827 100644 (file)
@@ -47,6 +47,7 @@ cd %binfolder%
 ::%cmakeBin% -D BUILD_BBTK_PACKAGE_creaVtk_DOXYGEN_DOC:BOOL=%3 CMakeCache.txt
 ::%cmakeBin% CMakeCache.txt
 
+%cmakeBin% -D CMAKE_CXX_FLAGS:STRING=-openmp
 %cmakeBin% -D crea_DIR:PATH=%1\c_%buildtype%%platforme%\ci CMakeCache.txt
 %cmakeBin% -D BBTK_DIR:PATH=%1\c_%buildtype%%platforme%\ci CMakeCache.txt
 %cmakeBin% -D BUILD_BBTK_PACKAGE_creaVtk:BOOL=ON -D creaVtk_DOC:BOOL=%3 CMakeCache.txt
@@ -55,4 +56,4 @@ cd %binfolder%
 
 
 
-exit /B
\ No newline at end of file
+exit /B
index c9ee2babdc25335d280152a394ff96f223af5605..a03f86d9e20f0add11bfd4c840bd267001632fa5 100644 (file)
@@ -32,7 +32,7 @@ currentdir=$2
 binfolder=$2/creatools_bin/$1Bin
 cd $binfolder
 
-cmake -D CMAKE_CXX_FLAGS:STRING=-fPIC                       CMakeCache.txt
+cmake -D CMAKE_CXX_FLAGS:STRING=-fPIC  -fopenmp             CMakeCache.txt
 cmake -D BBTK_DIR:PATH=$currentdir/creatools_bin/bbtkBin    CMakeCache.txt
 cmake -D crea_DIR:PATH=$currentdir/creatools_bin/creaBin    CMakeCache.txt
 cmake -D BUILD_BBTK_PACKAGE_creaVtk:BOOL=ON                    CMakeCache.txt