From dfa8964f9245cb267d30277c6ce6f729d651a645 Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Mon, 18 Mar 2019 16:45:27 +0100 Subject: [PATCH] #3237 creaToolsTools Feature New Normal - Compile with openmp creaVtk creaMaracasVisu --- .../Install_CreaTools/scripts/creaMaracasVariables.bat | 2 +- Install_mingw64/Install_CreaTools/scripts/creaVtkVariables.bat | 3 ++- Linux/scripts/creaVtkVariables.sh | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Install_mingw64/Install_CreaTools/scripts/creaMaracasVariables.bat b/Install_mingw64/Install_CreaTools/scripts/creaMaracasVariables.bat index 44f47a4..23aab2b 100644 --- a/Install_mingw64/Install_CreaTools/scripts/creaMaracasVariables.bat +++ b/Install_mingw64/Install_CreaTools/scripts/creaMaracasVariables.bat @@ -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 diff --git a/Install_mingw64/Install_CreaTools/scripts/creaVtkVariables.bat b/Install_mingw64/Install_CreaTools/scripts/creaVtkVariables.bat index b650848..8e85bbb 100644 --- a/Install_mingw64/Install_CreaTools/scripts/creaVtkVariables.bat +++ b/Install_mingw64/Install_CreaTools/scripts/creaVtkVariables.bat @@ -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 diff --git a/Linux/scripts/creaVtkVariables.sh b/Linux/scripts/creaVtkVariables.sh index c9ee2ba..a03f86d 100644 --- a/Linux/scripts/creaVtkVariables.sh +++ b/Linux/scripts/creaVtkVariables.sh @@ -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 -- 2.47.1