From: Nabil Ghodbane Date: Wed, 12 Jun 2024 15:28:32 +0000 (+0200) Subject: spns #42205 [SAT][Windows] support different values for CMAKE_BUILD_TYPE X-Git-Tag: V9_13_0rc2~30 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e01e3e02ab64ad084438891012cdb0d9318d6d66;p=tools%2Fsat_salome.git spns #42205 [SAT][Windows] support different values for CMAKE_BUILD_TYPE --- diff --git a/applications/MEDCOUPLING-9.10.0-windows.pyconf b/applications/MEDCOUPLING-9.10.0-windows.pyconf index ce321ee..067ef9c 100644 --- a/applications/MEDCOUPLING-9.10.0-windows.pyconf +++ b/applications/MEDCOUPLING-9.10.0-windows.pyconf @@ -5,7 +5,7 @@ APPLICATION : { name : 'MEDCOUPLING-9.10.0' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name - cmake_generator : 'Visual Studio 15 2017 Win64' + cmake_generator : 'Visual Studio 15 2017' tag : 'V9_10_0' debug : 'no' base : 'no' @@ -17,7 +17,7 @@ APPLICATION : CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION" SALOME_HAS_GLOBAL_ENV: "1" SALOME_USE_64BIT_IDS : '1' - CMAKE_GENERATOR : '"Visual Studio 15 2017 Win64"' # strangely not exposed in scripts... + CMAKE_GENERATOR : '"Visual Studio 15 2017"' # strangely not exposed in scripts... } launch : { diff --git a/applications/MEDCOUPLING-9.11.0-windows.pyconf b/applications/MEDCOUPLING-9.11.0-windows.pyconf index 5052b8e..b54c135 100644 --- a/applications/MEDCOUPLING-9.11.0-windows.pyconf +++ b/applications/MEDCOUPLING-9.11.0-windows.pyconf @@ -5,7 +5,7 @@ APPLICATION : { name : 'MEDCOUPLING-9.11.0' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name - cmake_generator : 'Visual Studio 15 2017 Win64' + cmake_generator : 'Visual Studio 15 2017' tag : 'V9_11_0' debug : 'no' base : 'no' @@ -17,7 +17,7 @@ APPLICATION : CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION" SALOME_HAS_GLOBAL_ENV: "1" SALOME_USE_64BIT_IDS : '1' - CMAKE_GENERATOR : '"Visual Studio 15 2017 Win64"' # strangely not exposed in scripts... + CMAKE_GENERATOR : '"Visual Studio 15 2017"' # strangely not exposed in scripts... } launch : { diff --git a/applications/MEDCOUPLING-9.12.0-windows.pyconf b/applications/MEDCOUPLING-9.12.0-windows.pyconf index c20dca7..d1582e9 100644 --- a/applications/MEDCOUPLING-9.12.0-windows.pyconf +++ b/applications/MEDCOUPLING-9.12.0-windows.pyconf @@ -5,7 +5,7 @@ APPLICATION : { name : 'MEDCOUPLING-9.12.0' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name - cmake_generator : 'Visual Studio 15 2017 Win64' + cmake_generator : 'Visual Studio 15 2017' tag : 'V9_12_0' debug : 'no' base : 'no' @@ -17,7 +17,7 @@ APPLICATION : CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION" SALOME_HAS_GLOBAL_ENV: "1" SALOME_USE_64BIT_IDS : '1' - CMAKE_GENERATOR : '"Visual Studio 15 2017 Win64"' # strangely not exposed in scripts... + CMAKE_GENERATOR : '"Visual Studio 15 2017"' # strangely not exposed in scripts... } launch : { diff --git a/applications/MEDCOUPLING-9.3.0-windows.pyconf b/applications/MEDCOUPLING-9.3.0-windows.pyconf index f15baf9..a760a60 100644 --- a/applications/MEDCOUPLING-9.3.0-windows.pyconf +++ b/applications/MEDCOUPLING-9.3.0-windows.pyconf @@ -5,7 +5,7 @@ APPLICATION : { name : 'MEDCOUPLING-9.3.0' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name - cmake_generator : 'Visual Studio 15 2017 Win64' + cmake_generator : 'Visual Studio 15 2017' tag : 'V9_3_0' debug : 'no' dev : 'no' diff --git a/applications/MEDCOUPLING-9.4.0-windows.pyconf b/applications/MEDCOUPLING-9.4.0-windows.pyconf index b502164..5be4bec 100644 --- a/applications/MEDCOUPLING-9.4.0-windows.pyconf +++ b/applications/MEDCOUPLING-9.4.0-windows.pyconf @@ -5,7 +5,7 @@ APPLICATION : { name : 'MEDCOUPLING-9.4.0' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name - cmake_generator : 'Visual Studio 15 2017 Win64' + cmake_generator : 'Visual Studio 15 2017' tag : 'V9_4_0' debug : 'no' dev : 'no' @@ -17,7 +17,7 @@ APPLICATION : { CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION" SALOME_HAS_GLOBAL_ENV: "1" - CMAKE_GENERATOR : '"Visual Studio 15 2017 Win64"' # strangely not exposed in scripts... + CMAKE_GENERATOR : '"Visual Studio 15 2017"' # strangely not exposed in scripts... } launch : { diff --git a/applications/MEDCOUPLING-9.5.0-windows.pyconf b/applications/MEDCOUPLING-9.5.0-windows.pyconf index b9cb7ce..b2fc2f6 100644 --- a/applications/MEDCOUPLING-9.5.0-windows.pyconf +++ b/applications/MEDCOUPLING-9.5.0-windows.pyconf @@ -5,7 +5,7 @@ APPLICATION : { name : 'MEDCOUPLING-9.5.0' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name - cmake_generator : 'Visual Studio 15 2017 Win64' + cmake_generator : 'Visual Studio 15 2017' tag : 'V9_5_0' debug : 'no' dev : 'no' @@ -17,7 +17,7 @@ APPLICATION : { CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION" SALOME_HAS_GLOBAL_ENV: "1" - CMAKE_GENERATOR : '"Visual Studio 15 2017 Win64"' # strangely not exposed in scripts... + CMAKE_GENERATOR : '"Visual Studio 15 2017"' # strangely not exposed in scripts... } launch : { diff --git a/applications/MEDCOUPLING-9.6.0-windows.pyconf b/applications/MEDCOUPLING-9.6.0-windows.pyconf index 530dac9..5f40d35 100644 --- a/applications/MEDCOUPLING-9.6.0-windows.pyconf +++ b/applications/MEDCOUPLING-9.6.0-windows.pyconf @@ -5,7 +5,7 @@ APPLICATION : { name : 'MEDCOUPLING-9.6.0' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name - cmake_generator : 'Visual Studio 15 2017 Win64' + cmake_generator : 'Visual Studio 15 2017' tag : 'V9_6_0' debug : 'no' base : 'no' @@ -17,7 +17,7 @@ APPLICATION : CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION" SALOME_HAS_GLOBAL_ENV: "1" SALOME_USE_64BIT_IDS : '1' - CMAKE_GENERATOR : '"Visual Studio 15 2017 Win64"' # strangely not exposed in scripts... + CMAKE_GENERATOR : '"Visual Studio 15 2017"' # strangely not exposed in scripts... } launch : { diff --git a/applications/MEDCOUPLING-9.7.0-windows.pyconf b/applications/MEDCOUPLING-9.7.0-windows.pyconf index 1406416..a89b305 100644 --- a/applications/MEDCOUPLING-9.7.0-windows.pyconf +++ b/applications/MEDCOUPLING-9.7.0-windows.pyconf @@ -5,7 +5,7 @@ APPLICATION : { name : 'MEDCOUPLING-9.7.0' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name - cmake_generator : 'Visual Studio 15 2017 Win64' + cmake_generator : 'Visual Studio 15 2017' tag : 'V9_7_0' debug : 'no' base : 'no' @@ -17,7 +17,7 @@ APPLICATION : CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION" SALOME_HAS_GLOBAL_ENV: "1" SALOME_USE_64BIT_IDS : '1' - CMAKE_GENERATOR : '"Visual Studio 15 2017 Win64"' # strangely not exposed in scripts... + CMAKE_GENERATOR : '"Visual Studio 15 2017"' # strangely not exposed in scripts... } launch : { diff --git a/applications/MEDCOUPLING-9.8.0-windows.pyconf b/applications/MEDCOUPLING-9.8.0-windows.pyconf index 4772892..0194590 100644 --- a/applications/MEDCOUPLING-9.8.0-windows.pyconf +++ b/applications/MEDCOUPLING-9.8.0-windows.pyconf @@ -5,7 +5,7 @@ APPLICATION : { name : 'MEDCOUPLING-9.8.0' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name - cmake_generator : 'Visual Studio 15 2017 Win64' + cmake_generator : 'Visual Studio 15 2017' tag : 'V9_8_0' debug : 'no' base : 'no' @@ -17,7 +17,7 @@ APPLICATION : CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION" SALOME_HAS_GLOBAL_ENV: "1" SALOME_USE_64BIT_IDS : '1' - CMAKE_GENERATOR : '"Visual Studio 15 2017 Win64"' # strangely not exposed in scripts... + CMAKE_GENERATOR : '"Visual Studio 15 2017"' # strangely not exposed in scripts... } launch : { diff --git a/applications/MEDCOUPLING-9.9.0-windows.pyconf b/applications/MEDCOUPLING-9.9.0-windows.pyconf index ff747fd..44ded94 100644 --- a/applications/MEDCOUPLING-9.9.0-windows.pyconf +++ b/applications/MEDCOUPLING-9.9.0-windows.pyconf @@ -5,7 +5,7 @@ APPLICATION : { name : 'MEDCOUPLING-9.9.0' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name - cmake_generator : 'Visual Studio 15 2017 Win64' + cmake_generator : 'Visual Studio 15 2017' tag : 'V9_9_0' debug : 'no' base : 'no' @@ -17,7 +17,7 @@ APPLICATION : CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION" SALOME_HAS_GLOBAL_ENV: "1" SALOME_USE_64BIT_IDS : '1' - CMAKE_GENERATOR : '"Visual Studio 15 2017 Win64"' # strangely not exposed in scripts... + CMAKE_GENERATOR : '"Visual Studio 15 2017"' # strangely not exposed in scripts... } launch : { diff --git a/applications/MEDCOUPLING-master-windows.pyconf b/applications/MEDCOUPLING-master-windows.pyconf index 2f9a414..c7dc7d8 100644 --- a/applications/MEDCOUPLING-master-windows.pyconf +++ b/applications/MEDCOUPLING-master-windows.pyconf @@ -5,7 +5,7 @@ APPLICATION : { name : 'MEDCOUPLING-master' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name - cmake_generator : 'Visual Studio 15 2017 Win64' + cmake_generator : 'Visual Studio 15 2017' tag : 'master' debug : 'no' base : 'no' @@ -17,7 +17,7 @@ APPLICATION : CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION" SALOME_HAS_GLOBAL_ENV: "1" SALOME_USE_64BIT_IDS : '1' - CMAKE_GENERATOR : '"Visual Studio 15 2017 Win64"' # strangely not exposed in scripts... + CMAKE_GENERATOR : '"Visual Studio 15 2017"' # strangely not exposed in scripts... } launch : { diff --git a/applications/SALOME-9.10.0-windows.pyconf b/applications/SALOME-9.10.0-windows.pyconf index 49084e5..164508b 100644 --- a/applications/SALOME-9.10.0-windows.pyconf +++ b/applications/SALOME-9.10.0-windows.pyconf @@ -5,7 +5,7 @@ APPLICATION : { name : 'SALOME-9.10.0' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name - cmake_generator : 'Visual Studio 15 2017 Win64' + cmake_generator : 'Visual Studio 15 2017' tag : 'V9_10_0' dev : 'no' verbose : 'no' @@ -21,7 +21,7 @@ APPLICATION : SALOME_HAS_GLOBAL_ENV : "1" SALOME_USE_64BIT_IDS : '1' SET_usr_docs_VARS : "1" # required for PyEditor build - CMAKE_GENERATOR : '"Visual Studio 15 2017 Win64"' + CMAKE_GENERATOR : '"Visual Studio 15 2017"' } launch : { diff --git a/applications/SALOME-9.11.0-windows.pyconf b/applications/SALOME-9.11.0-windows.pyconf index 6c60d6f..6561a6f 100644 --- a/applications/SALOME-9.11.0-windows.pyconf +++ b/applications/SALOME-9.11.0-windows.pyconf @@ -5,7 +5,7 @@ APPLICATION : { name : 'SALOME-9.11.0' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name - cmake_generator : 'Visual Studio 15 2017 Win64' + cmake_generator : 'Visual Studio 15 2017' tag : 'V9_11_0' dev : 'no' verbose : 'no' @@ -21,7 +21,7 @@ APPLICATION : SALOME_HAS_GLOBAL_ENV : "1" SALOME_USE_64BIT_IDS : '1' SET_usr_docs_VARS : "1" # required for PyEditor build - CMAKE_GENERATOR : '"Visual Studio 15 2017 Win64"' + CMAKE_GENERATOR : '"Visual Studio 15 2017"' } launch : { diff --git a/applications/SALOME-9.12.0-windows.pyconf b/applications/SALOME-9.12.0-windows.pyconf index 318b6b3..6806492 100644 --- a/applications/SALOME-9.12.0-windows.pyconf +++ b/applications/SALOME-9.12.0-windows.pyconf @@ -5,7 +5,7 @@ APPLICATION : { name : 'SALOME-9.12.0' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name - cmake_generator : 'Visual Studio 15 2017 Win64' + cmake_generator : 'Visual Studio 15 2017' tag : 'V9_12_0' dev : 'no' verbose : 'no' @@ -21,7 +21,7 @@ APPLICATION : SALOME_HAS_GLOBAL_ENV : "1" SALOME_USE_64BIT_IDS : '1' SET_usr_docs_VARS : "1" # required for PyEditor build - CMAKE_GENERATOR : '"Visual Studio 15 2017 Win64"' + CMAKE_GENERATOR : '"Visual Studio 15 2017"' } launch : { diff --git a/applications/SALOME-9.4.0-windows.pyconf b/applications/SALOME-9.4.0-windows.pyconf index 1b21006..85ef05f 100644 --- a/applications/SALOME-9.4.0-windows.pyconf +++ b/applications/SALOME-9.4.0-windows.pyconf @@ -5,7 +5,7 @@ APPLICATION : { name : 'SALOME-9.4.0' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name - cmake_generator : 'Visual Studio 15 2017 Win64' + cmake_generator : 'Visual Studio 15 2017' tag : 'V9_4_0' debug : 'no' dev : 'no' diff --git a/applications/SALOME-9.5.0-windows.pyconf b/applications/SALOME-9.5.0-windows.pyconf index 148d68d..d93308e 100644 --- a/applications/SALOME-9.5.0-windows.pyconf +++ b/applications/SALOME-9.5.0-windows.pyconf @@ -5,7 +5,7 @@ APPLICATION : { name : 'SALOME-9.5.0' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name - cmake_generator : 'Visual Studio 15 2017 Win64' + cmake_generator : 'Visual Studio 15 2017' tag : 'V9_5_0' dev : 'no' verbose :'no' diff --git a/applications/SALOME-9.6.0-windows.pyconf b/applications/SALOME-9.6.0-windows.pyconf index 6c15acf..c2c9a41 100644 --- a/applications/SALOME-9.6.0-windows.pyconf +++ b/applications/SALOME-9.6.0-windows.pyconf @@ -5,7 +5,7 @@ APPLICATION : { name : 'SALOME-9.6.0' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name - cmake_generator : 'Visual Studio 15 2017 Win64' + cmake_generator : 'Visual Studio 15 2017' tag : 'V9_6_0' dev : 'no' verbose :'no' @@ -21,7 +21,7 @@ APPLICATION : SALOME_HAS_GLOBAL_ENV : "1" SET_usr_docs_VARS : "1" # required for PyEditor build SALOME_USE_64BIT_IDS : "1" - CMAKE_GENERATOR : '"Visual Studio 15 2017 Win64"' + CMAKE_GENERATOR : '"Visual Studio 15 2017"' } launch : {PYTHONIOENCODING:"UTF_8", SALOME_MODULES_ORDER:"SHAPER:SHAPERSTUDY:GEOM:SMESH"} SALOME_trace : "local" # local/file:.../with_logger diff --git a/applications/SALOME-9.7.0-windows.pyconf b/applications/SALOME-9.7.0-windows.pyconf index fe60685..dd6243a 100644 --- a/applications/SALOME-9.7.0-windows.pyconf +++ b/applications/SALOME-9.7.0-windows.pyconf @@ -5,7 +5,7 @@ APPLICATION : { name : 'SALOME-9.7.0' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name - cmake_generator : 'Visual Studio 15 2017 Win64' + cmake_generator : 'Visual Studio 15 2017' tag : 'V9_7_0' dev : 'no' verbose :'no' @@ -21,7 +21,7 @@ APPLICATION : SALOME_HAS_GLOBAL_ENV : "1" SALOME_USE_64BIT_IDS : '1' SET_usr_docs_VARS : "1" # required for PyEditor build - CMAKE_GENERATOR : '"Visual Studio 15 2017 Win64"' + CMAKE_GENERATOR : '"Visual Studio 15 2017"' } launch : {PYTHONIOENCODING:"UTF_8", SALOME_MODULES_ORDER:"SHAPER:SHAPERSTUDY:GEOM:SMESH"} SALOME_trace : "local" # local/file:.../with_logger diff --git a/applications/SALOME-9.8.0-windows.pyconf b/applications/SALOME-9.8.0-windows.pyconf index 8e814d4..e5a8e0e 100644 --- a/applications/SALOME-9.8.0-windows.pyconf +++ b/applications/SALOME-9.8.0-windows.pyconf @@ -5,7 +5,7 @@ APPLICATION : { name : 'SALOME-9.8.0' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name - cmake_generator : 'Visual Studio 15 2017 Win64' + cmake_generator : 'Visual Studio 15 2017' tag : 'V9_8_0' dev : 'no' verbose :'no' @@ -21,7 +21,7 @@ APPLICATION : SALOME_HAS_GLOBAL_ENV : "1" SALOME_USE_64BIT_IDS : '1' SET_usr_docs_VARS : "1" # required for PyEditor build - CMAKE_GENERATOR : '"Visual Studio 15 2017 Win64"' + CMAKE_GENERATOR : '"Visual Studio 15 2017"' } launch : {PYTHONIOENCODING:"UTF_8", SALOME_MODULES_ORDER:"SHAPER:SHAPERSTUDY:GEOM:SMESH"} SALOME_trace : "local" # local/file:.../with_logger diff --git a/applications/SALOME-9.9.0-windows.pyconf b/applications/SALOME-9.9.0-windows.pyconf index e5572ef..3e7d5c3 100644 --- a/applications/SALOME-9.9.0-windows.pyconf +++ b/applications/SALOME-9.9.0-windows.pyconf @@ -5,7 +5,7 @@ APPLICATION : { name : 'SALOME-9.9.0' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name - cmake_generator : 'Visual Studio 15 2017 Win64' + cmake_generator : 'Visual Studio 15 2017' tag : 'V9_9_0' dev : 'no' verbose : 'no' @@ -21,7 +21,7 @@ APPLICATION : SALOME_HAS_GLOBAL_ENV : "1" SALOME_USE_64BIT_IDS : '1' SET_usr_docs_VARS : "1" # required for PyEditor build - CMAKE_GENERATOR : '"Visual Studio 15 2017 Win64"' + CMAKE_GENERATOR : '"Visual Studio 15 2017"' } launch : { diff --git a/applications/SALOME-master-windows.pyconf b/applications/SALOME-master-windows.pyconf index 8bc3c78..bbb9919 100644 --- a/applications/SALOME-master-windows.pyconf +++ b/applications/SALOME-master-windows.pyconf @@ -5,7 +5,8 @@ APPLICATION : { name : 'SALOME-master' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name - cmake_generator : 'Visual Studio 15 2017 Win64' + cmake_generator : 'Visual Studio 15 2017' + cmake_build_mode: 'Release' # Debug, RelWithDebInfo, Release, MinSizeRel tag : 'master' dev : 'no' verbose : 'no' @@ -22,7 +23,7 @@ APPLICATION : SALOME_HAS_GLOBAL_ENV : "1" SALOME_USE_64BIT_IDS : '1' SET_usr_docs_VARS : "1" # required for PyEditor build - CMAKE_GENERATOR : '"Visual Studio 15 2017 Win64"' + CMAKE_GENERATOR : '"Visual Studio 15 2017"' } launch : { diff --git a/products/CDMATH.pyconf b/products/CDMATH.pyconf index 64c95eb..ea26fe9 100644 --- a/products/CDMATH.pyconf +++ b/products/CDMATH.pyconf @@ -2,8 +2,7 @@ default : { name : "CDMATH" build_source : "cmake" - #cmake_options : "-DCDMATH_WITH_PYTHON=ON"# -DCMAKE_BUILD_TYPE=Release - cmake_options : "-DCMAKE_BUILD_TYPE=Release -DCDMATH_WITH_PYTHON=ON" + cmake_options : "-DCDMATH_WITH_PYTHON=ON" get_source : "git" git_info: { diff --git a/products/FIELDS.pyconf b/products/FIELDS.pyconf index 25e9dcf..ba697a2 100755 --- a/products/FIELDS.pyconf +++ b/products/FIELDS.pyconf @@ -44,6 +44,16 @@ default_MPI : ] } +version_V9_10_0: +{ + patches: [] +} + +version_V9_10_0_win: +{ + patches: ["FIELDS-9.10.0-visual-2019.patch"] +} + version_V9_10_0_MPI : { cmake_options : "-DSALOME_USE_MPI=ON -DMEDCOUPLING_USE_64BIT_IDS=ON" diff --git a/products/GEOM.pyconf b/products/GEOM.pyconf index cbc9fc1..322ef10 100644 --- a/products/GEOM.pyconf +++ b/products/GEOM.pyconf @@ -79,6 +79,37 @@ default_win : ] } +version_V9_10_0: +{ +} + +version_V9_10_0_win : +{ + cmake_options : " -DSWIG_EXECUTABLE=%SWIG_ROOT_DIR:\=/%/bin/swig.exe -DSALOME_GEOM_USE_OPENCV=ON -DOPENCV_ROOT_DIR=%OPENCV_ROOT_DIR:\=/% -DOpenCV_INCLUDE_DIRS=%OpenCV_INCLUDE_DIRS:\=/% " + depend : ["KERNEL", + "GUI", + "boost", + "CAS", + "Python", + "hdf5", + "omniORB", + "qt", + "ParaView", + "docutils", + "Sphinx", + "Jinja2", + "setuptools", + "Pygments", + "opencv", + "six", + "pytz", + "psutil", + "sphinxintl" + ] + patches : ['GEOM-9.10.0-visual-2019.patch'] + nb_proc : 1 +} + version_V9_4_0_to_V9_6_0 : { depend : ["KERNEL", diff --git a/products/GUI.pyconf b/products/GUI.pyconf index 726816d..787f8ed 100644 --- a/products/GUI.pyconf +++ b/products/GUI.pyconf @@ -76,6 +76,16 @@ default_win : } +version_V9_10_0: +{ + patches: [] +} + +version_V9_10_0_win: +{ + patches: ["GUI-9.10.0-cmath-visual-2019.patch"] +} + version_V9_5_0: { cmake_options : "-DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig" diff --git a/products/KERNEL.pyconf b/products/KERNEL.pyconf index f4f635c..1ccfaab 100644 --- a/products/KERNEL.pyconf +++ b/products/KERNEL.pyconf @@ -313,6 +313,42 @@ ALAMOS_SALOME_9_win : } } +version_ALAMOS_SALOME_9_10_0_win : +{ + name : "KERNEL" + build_source : "cmake" + cmake_options : " -DSWIG_EXECUTABLE=%SWIG_ROOT_DIR:\=/%/bin/swig.exe" + depend : ["Python", + "boost", + "numpy", + "lapack", + "hdf5", + "omniORB", + "omniORBpy", + "docutils", + "graphviz", + "libxml2", + "Sphinx", + "sphinxintl", + "Jinja2", + "setuptools", + "Pygments", + "pytz", + "pthreads" + ] + build_depend : ["cmake", "swig", "doxygen", "cppunit"] + get_source : "git" + git_info: + { + repo : $PROJECTS.projects.salome.git_info.default_git_server + "modules/kernel.git" + repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "kernel.git" + } + environ : + { + } + patches: ['KERNEL-9.10.0-visual-2019.patch'] +} + # this section is equivalent with version_7_8_0_to_8_4_0, without LIBBATCH ALAMOS : { diff --git a/products/MEDCOUPLING.pyconf b/products/MEDCOUPLING.pyconf index d21dd41..9aa0b98 100644 --- a/products/MEDCOUPLING.pyconf +++ b/products/MEDCOUPLING.pyconf @@ -192,6 +192,16 @@ default_32BIT_IDS_MPI_STD : opt_depend : ["ParMetis", "metis"] } +version_V9_10_0: +{ + patches: [] +} + +version_V9_10_0_win: +{ + patches: ["MEDCOUPLING-9.10.0-visual-2019.patch"] +} + version_V9_10_0_MPI_STD : { cmake_options : "-DMEDCOUPLING_ENABLE_PYTHON=ON -DMEDCOUPLING_ENABLE_PARTITIONER=OFF -DMEDCOUPLING_ENABLE_RENUMBER=ON -DMEDCOUPLING_PARTITIONER_METIS=OFF -DMEDCOUPLING_PARTITIONER_SCOTCH=ON -DMEDCOUPLING_PARTITIONER_PARMETIS=ON -DMEDCOUPLING_MICROMED=OFF -DMEDCOUPLING_USE_MPI=ON -DSALOME_USE_MPI=ON -DMEDCOUPLING_USE_64BIT_IDS=ON -DCMAKE_CXX_COMPILER:STRING=${MPI_CXX_COMPILER} -DCMAKE_C_COMPILER:STRING=${MPI_C_COMPILER}" diff --git a/products/SHAPER.pyconf b/products/SHAPER.pyconf index da5088c..5305b2f 100644 --- a/products/SHAPER.pyconf +++ b/products/SHAPER.pyconf @@ -67,6 +67,15 @@ version_V9_10_0_FD37: patches : ['SPNS-32377-SHAPER-V9_10_0-FD37.patch'] } +version_V9_10_0: +{ +} + +version_V9_10_0_win: +{ + patches: ['SHAPER-9.10.0-visual-2019.patch'] +} + version_V9_9_0_UB22_04: { patches : ['SPNS-29880-SHAPER-V9_9_0.patch'] diff --git a/products/compil_scripts/ADAO.bat b/products/compil_scripts/ADAO.bat index 729af33..a48be32 100644 --- a/products/compil_scripts/ADAO.bat +++ b/products/compil_scripts/ADAO.bat @@ -9,12 +9,14 @@ IF NOT DEFINED SAT_DEBUG ( ) IF NOT DEFINED CMAKE_GENERATOR ( - SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64" + SET CMAKE_GENERATOR="Visual Studio 15 2017" ) SET PRODUCT_BUILD_TYPE=release +IF DEFINED SAT_CMAKE_BUILD_TYPE ( + SET PRODUCT_BUILD_TYPE=%SAT_CMAKE_BUILD_TYPE% +) -REM TODO: NGH: not Tested yet if %SAT_DEBUG% == 1 ( set PRODUCT_BUILD_TYPE=debug ) @@ -36,9 +38,10 @@ set PYTHONPATH=%PRODUCT_INSTALL%/lib/python%PYTHON_VERSION%/site-packages;%PYTHO cd %BUILD_DIR% set CMAKE_OPTIONS= set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_PREFIX:STRING=%PRODUCT_INSTALL:\=/% -set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE=Release +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE=%PRODUCT_BUILD_TYPE% set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPYTHON_EXECUTABLE=%PYTHONBIN:\=/% -set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -A x64 set MSBUILDDISABLENODEREUSE=1 @@ -56,11 +59,11 @@ if NOT %ERRORLEVEL% == 0 ( echo. echo ********************************************************************* -echo *** msbuild %MAKE_OPTIONS% /p:Configuration=Release /p:Platform=x64 ALL_BUILD.vcxproj +echo *** msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 ALL_BUILD.vcxproj echo ********************************************************************* echo. -msbuild %MAKE_OPTIONS% /p:Configuration=Release /p:Platform=x64 ALL_BUILD.vcxproj +msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 ALL_BUILD.vcxproj if NOT %ERRORLEVEL% == 0 ( echo ERROR on msbuild ALL_BUILD.vcxproj exit 2 @@ -72,7 +75,7 @@ echo *** installation... echo ********************************************************************* echo. -msbuild %MAKE_OPTIONS% /p:Configuration=Release /p:Platform=x64 INSTALL.vcxproj +msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 INSTALL.vcxproj if NOT %ERRORLEVEL% == 0 ( echo ERROR on msbuild INSTALL.vcxproj exit 3 @@ -85,13 +88,13 @@ set ADAO_PYTHON_ROOT_DIR=%CURRENT_SOFTWARE_INSTALL_DIR% set ADAO_ENGINE_ROOT_DIR=%CURRENT_SOFTWARE_INSTALL_DIR% set CMAKE_OPTIONS= set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_PREFIX:STRING=%PRODUCT_INSTALL:\=/% -set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE=Release +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE=%PRODUCT_BUILD_TYPE% set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DADAO_PYTHON_MODULE:BOOL=OFF set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPYTHON_EXECUTABLE=%PYTHONBIN:\=/% set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DKERNEL_ROOT_DIR=%KERNEL_ROOT_DIR:\=/% set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DADAO_PYTHON_ROOT_DIR=%ADAO_PYTHON_ROOT_DIR:\=/% set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DEFICAS_ROOT_DIR=%EFICAS_TOOLS_ROOT_DIR:\=/% -set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64 echo. echo ********************************************************************* @@ -109,11 +112,11 @@ REM set CL=/D__WIN32__ /DSIZEOF_INT=4 /DSIZEOF_LONG=4 %CL% echo. echo ********************************************************************* -echo *** msbuild %MAKE_OPTIONS% /p:Configuration=Release /p:Platform=x64 ALL_BUILD.vcxproj +echo *** msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 ALL_BUILD.vcxproj echo ********************************************************************* echo. -msbuild %MAKE_OPTIONS% /p:Configuration=Release /p:Platform=x64 ALL_BUILD.vcxproj +msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 ALL_BUILD.vcxproj if NOT %ERRORLEVEL% == 0 ( echo ERROR on msbuild ALL_BUILD.vcxproj exit 2 @@ -125,7 +128,7 @@ echo *** installation... echo ********************************************************************* echo. -msbuild %MAKE_OPTIONS% /p:Configuration=Release /p:Platform=x64 INSTALL.vcxproj +msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 INSTALL.vcxproj if NOT %ERRORLEVEL% == 0 ( echo ERROR on msbuild INSTALL.vcxproj exit 3 diff --git a/products/compil_scripts/CAS_7.3.bat b/products/compil_scripts/CAS_7.3.bat index abbce79..1cf4171 100644 --- a/products/compil_scripts/CAS_7.3.bat +++ b/products/compil_scripts/CAS_7.3.bat @@ -9,10 +9,14 @@ IF NOT DEFINED SAT_DEBUG ( ) IF NOT DEFINED CMAKE_GENERATOR ( - SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64" + SET CMAKE_GENERATOR="Visual Studio 15 2017" ) SET PRODUCT_BUILD_TYPE=Release +IF DEFINED SAT_CMAKE_BUILD_TYPE ( + SET PRODUCT_BUILD_TYPE=%SAT_CMAKE_BUILD_TYPE% +) + if %SAT_DEBUG% == 1 ( set PRODUCT_BUILD_TYPE=Debug ) @@ -25,7 +29,8 @@ mkdir %BUILD_DIR% cd %BUILD_DIR% -set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64 + set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE:STRING=%PRODUCT_BUILD_TYPE% set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_PREFIX:STRING=%PRODUCT_INSTALL:\=/% diff --git a/products/compil_scripts/CAS_7.4.bat b/products/compil_scripts/CAS_7.4.bat index 81087e4..cc12230 100644 --- a/products/compil_scripts/CAS_7.4.bat +++ b/products/compil_scripts/CAS_7.4.bat @@ -9,10 +9,14 @@ IF NOT DEFINED SAT_DEBUG ( ) IF NOT DEFINED CMAKE_GENERATOR ( - SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64" + SET CMAKE_GENERATOR="Visual Studio 15 2017" ) SET PRODUCT_BUILD_TYPE=Release +IF DEFINED SAT_CMAKE_BUILD_TYPE ( + SET PRODUCT_BUILD_TYPE=%SAT_CMAKE_BUILD_TYPE% +) + if %SAT_DEBUG% == 1 ( set PRODUCT_BUILD_TYPE=Debug ) @@ -25,7 +29,7 @@ mkdir %BUILD_DIR% cd %BUILD_DIR% -set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE:STRING=%PRODUCT_BUILD_TYPE% set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_PREFIX:STRING=%PRODUCT_INSTALL:\=/% diff --git a/products/compil_scripts/CAS_7.5.bat b/products/compil_scripts/CAS_7.5.bat index 879ea1d..6d7dd83 100644 --- a/products/compil_scripts/CAS_7.5.bat +++ b/products/compil_scripts/CAS_7.5.bat @@ -9,10 +9,14 @@ IF NOT DEFINED SAT_DEBUG ( ) IF NOT DEFINED CMAKE_GENERATOR ( - SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64" + SET CMAKE_GENERATOR="Visual Studio 15 2017" ) SET PRODUCT_BUILD_TYPE=Release +IF DEFINED SAT_CMAKE_BUILD_TYPE ( + SET PRODUCT_BUILD_TYPE=%SAT_CMAKE_BUILD_TYPE% +) + if %SAT_DEBUG% == 1 ( set PRODUCT_BUILD_TYPE=Debug ) @@ -25,7 +29,7 @@ mkdir %BUILD_DIR% cd %BUILD_DIR% -set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE:STRING=%PRODUCT_BUILD_TYPE% set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_PREFIX:STRING=%PRODUCT_INSTALL:\=/% diff --git a/products/compil_scripts/CAS_7.8.bat b/products/compil_scripts/CAS_7.8.bat index e2bc014..e649d6a 100644 --- a/products/compil_scripts/CAS_7.8.bat +++ b/products/compil_scripts/CAS_7.8.bat @@ -9,10 +9,14 @@ IF NOT DEFINED SAT_DEBUG ( ) IF NOT DEFINED CMAKE_GENERATOR ( - SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64" + SET CMAKE_GENERATOR="Visual Studio 15 2017" ) SET PRODUCT_BUILD_TYPE=Release +IF DEFINED SAT_CMAKE_BUILD_TYPE ( + SET PRODUCT_BUILD_TYPE=%SAT_CMAKE_BUILD_TYPE% +) + if %SAT_DEBUG% == 1 ( set PRODUCT_BUILD_TYPE=Debug ) @@ -25,7 +29,7 @@ mkdir %BUILD_DIR% cd %BUILD_DIR% -set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR% -A x64 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE:STRING=%PRODUCT_BUILD_TYPE% set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_PREFIX:STRING=%PRODUCT_INSTALL:\=/% diff --git a/products/compil_scripts/FMILibrary-2.0.3.bat b/products/compil_scripts/FMILibrary-2.0.3.bat index a804c5c..29fe4d8 100644 --- a/products/compil_scripts/FMILibrary-2.0.3.bat +++ b/products/compil_scripts/FMILibrary-2.0.3.bat @@ -9,10 +9,14 @@ IF NOT DEFINED SAT_DEBUG ( ) IF NOT DEFINED CMAKE_GENERATOR ( - SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64" + SET CMAKE_GENERATOR="Visual Studio 15 2017" ) SET PRODUCT_BUILD_TYPE=Release +IF DEFINED SAT_CMAKE_BUILD_TYPE ( + SET PRODUCT_BUILD_TYPE=%SAT_CMAKE_BUILD_TYPE% +) + if %SAT_DEBUG% == 1 ( set PRODUCT_BUILD_TYPE=Debug ) @@ -28,7 +32,7 @@ SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_PREFIX:STRING=%PRODUCT_INSTALL set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE:STRING=%PRODUCT_BUILD_TYPE% set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DOpenBLAS_DIR=%OpenBLAS_DIR:\=/% set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DFMILIB_GENERATE_DOXYGEN_DOC=OFF -set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64 cd %BUILD_DIR% @@ -48,7 +52,7 @@ sed -i 's/Shlwapi.lib/ /g' fmilib.vcxproj echo. echo -------------------------------------------------------------------------- -echo *** msbuild %MAKE_OPTIONS% /p:Configuration=Release ALL_BUILD.vcxproj +echo *** msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% ALL_BUILD.vcxproj echo -------------------------------------------------------------------------- msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 ALL_BUILD.vcxproj diff --git a/products/compil_scripts/OPENTURNS_SALOME.bat b/products/compil_scripts/OPENTURNS_SALOME.bat index bcc800c..2e287a4 100644 --- a/products/compil_scripts/OPENTURNS_SALOME.bat +++ b/products/compil_scripts/OPENTURNS_SALOME.bat @@ -8,15 +8,18 @@ IF NOT DEFINED SAT_DEBUG ( SET SAT_DEBUG=0 ) +IF NOT DEFINED CMAKE_GENERATOR ( + SET CMAKE_GENERATOR="Visual Studio 15 2017" +) + SET PRODUCT_BUILD_TYPE=Release +IF DEFINED SAT_CMAKE_BUILD_TYPE ( + SET PRODUCT_BUILD_TYPE=%SAT_CMAKE_BUILD_TYPE% +) if %SAT_DEBUG% == 1 ( set PRODUCT_BUILD_TYPE=Debug ) -IF NOT DEFINED CMAKE_GENERATOR ( - SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64" -) - if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL% REM clean BUILD directory @@ -125,7 +128,7 @@ echo *** %CMAKE_ROOT%\bin\cmake %CMAKE_OPTIONS% %SOURCE_DIR% echo ********************************************************************* echo. -%CMAKE_ROOT%\bin\cmake -G %CMAKE_GENERATOR% %CMAKE_OPTIONS% %SOURCE_DIR% +%CMAKE_ROOT%\bin\cmake -G %CMAKE_GENERATOR% -A x64 %CMAKE_OPTIONS% %SOURCE_DIR% if NOT %ERRORLEVEL% == 0 ( echo "ERROR on cmake" exit 1 diff --git a/products/compil_scripts/PERSALYS-v13.0.bat b/products/compil_scripts/PERSALYS-v13.0.bat index 7202b1c..ff6d354 100644 --- a/products/compil_scripts/PERSALYS-v13.0.bat +++ b/products/compil_scripts/PERSALYS-v13.0.bat @@ -9,7 +9,7 @@ IF NOT DEFINED SAT_DEBUG ( ) IF NOT DEFINED CMAKE_GENERATOR ( - SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64" + SET CMAKE_GENERATOR="Visual Studio 15 2017" ) SET PRODUCT_BUILD_TYPE=Release @@ -32,7 +32,6 @@ SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DGUI_ROOT_DIR=%GUI_ROOT_DIR:\=/% SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DSalomeGUI_DIR=%GUI_ROOT_DIR:\=/%/adm_local/cmake_files SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DKERNEL_ROOT_DIR=%KERNEL_ROOT_DIR:\=/% SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DSalomeKERNEL_DIR=%KERNEL_ROOT_DIR:\=/%/salome_adm/cmake_files -REM SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DOpenTURNS_DIR=$OT_ROOT_DIR/lib/cmake/openturns SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPy2cpp_DIR=%PY2CPP_ROOT_DIR:\=/%/lib/cmake/py2cpp SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DQWT_INCLUDE_DIR=%QWT_ROOT_DIR:\=/%/include SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DUSE_SPHINX=OFF @@ -49,7 +48,7 @@ SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPYTHON_EXECUTABLE=%PYTHONBIN:\=/% SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPYTHON_INCLUDE_DIR=%PYTHON_INCLUDE:\=/% SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_FIND_ROOT_PATH=ON SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCGNS_INCLUDE_DIR:PATH=%CGNS_ROOT_DIR:\=/%/include -set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64 set MSBUILDDISABLENODEREUSE=1 diff --git a/products/compil_scripts/PERSALYS-v14.0.1.bat b/products/compil_scripts/PERSALYS-v14.0.1.bat index f092391..1b0c853 100644 --- a/products/compil_scripts/PERSALYS-v14.0.1.bat +++ b/products/compil_scripts/PERSALYS-v14.0.1.bat @@ -9,7 +9,7 @@ IF NOT DEFINED SAT_DEBUG ( ) IF NOT DEFINED CMAKE_GENERATOR ( - SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64" + SET CMAKE_GENERATOR="Visual Studio 15 2017" ) SET PRODUCT_BUILD_TYPE=Release @@ -123,7 +123,7 @@ echo *** %CMAKE_ROOT%\bin\cmake %CMAKE_OPTIONS% %SOURCE_DIR% echo ********************************************************************* echo. -%CMAKE_ROOT%\bin\cmake -G %CMAKE_GENERATOR% %CMAKE_OPTIONS% %SOURCE_DIR% +%CMAKE_ROOT%\bin\cmake -G %CMAKE_GENERATOR% -A x64 %CMAKE_OPTIONS% %SOURCE_DIR% if NOT %ERRORLEVEL% == 0 ( echo "ERROR on cmake" exit 1 diff --git a/products/compil_scripts/PERSALYS-v14.1.bat b/products/compil_scripts/PERSALYS-v14.1.bat index cd4f0aa..7baee79 100644 --- a/products/compil_scripts/PERSALYS-v14.1.bat +++ b/products/compil_scripts/PERSALYS-v14.1.bat @@ -14,7 +14,7 @@ if %SAT_DEBUG% == 1 ( ) IF NOT DEFINED CMAKE_GENERATOR ( - SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64" + SET CMAKE_GENERATOR="Visual Studio 15 2017" ) if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL% @@ -123,7 +123,7 @@ echo *** %CMAKE_ROOT%\bin\cmake %CMAKE_OPTIONS% %SOURCE_DIR% echo ********************************************************************* echo. -%CMAKE_ROOT%\bin\cmake -G %CMAKE_GENERATOR% %CMAKE_OPTIONS% %SOURCE_DIR% +%CMAKE_ROOT%\bin\cmake -G %CMAKE_GENERATOR% -A x64 %CMAKE_OPTIONS% %SOURCE_DIR% if NOT %ERRORLEVEL% == 0 ( echo "ERROR on cmake" exit 1 diff --git a/products/compil_scripts/PERSALYS-v16.0.1.bat b/products/compil_scripts/PERSALYS-v16.0.1.bat index cd4f0aa..93927b2 100644 --- a/products/compil_scripts/PERSALYS-v16.0.1.bat +++ b/products/compil_scripts/PERSALYS-v16.0.1.bat @@ -9,12 +9,15 @@ IF NOT DEFINED SAT_DEBUG ( ) SET PRODUCT_BUILD_TYPE=Release +IF DEFINED SAT_CMAKE_BUILD_TYPE ( + SET PRODUCT_BUILD_TYPE=%SAT_CMAKE_BUILD_TYPE% +) if %SAT_DEBUG% == 1 ( set PRODUCT_BUILD_TYPE=Debug ) IF NOT DEFINED CMAKE_GENERATOR ( - SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64" + SET CMAKE_GENERATOR="Visual Studio 15 2017" ) if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL% @@ -123,7 +126,7 @@ echo *** %CMAKE_ROOT%\bin\cmake %CMAKE_OPTIONS% %SOURCE_DIR% echo ********************************************************************* echo. -%CMAKE_ROOT%\bin\cmake -G %CMAKE_GENERATOR% %CMAKE_OPTIONS% %SOURCE_DIR% +%CMAKE_ROOT%\bin\cmake -G %CMAKE_GENERATOR% -A x64 %CMAKE_OPTIONS% %SOURCE_DIR% if NOT %ERRORLEVEL% == 0 ( echo "ERROR on cmake" exit 1 diff --git a/products/compil_scripts/ParaView-5.10.0.bat b/products/compil_scripts/ParaView-5.10.0.bat index ff7cd6d..52c8e7f 100644 --- a/products/compil_scripts/ParaView-5.10.0.bat +++ b/products/compil_scripts/ParaView-5.10.0.bat @@ -9,21 +9,23 @@ IF NOT DEFINED SAT_DEBUG ( ) IF NOT DEFINED CMAKE_GENERATOR ( - SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64" + SET CMAKE_GENERATOR="Visual Studio 15 2017" ) -if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL% -REM clean BUILD directory -if exist "%BUILD_DIR%" rmdir /Q /S %BUILD_DIR% -mkdir %BUILD_DIR% - SET PRODUCT_BUILD_TYPE=Release +IF DEFINED SAT_CMAKE_BUILD_TYPE ( + SET PRODUCT_BUILD_TYPE=%SAT_CMAKE_BUILD_TYPE% +) if %SAT_DEBUG% == 1 ( set PRODUCT_BUILD_TYPE=Debug ) -set PVLIBVERSION=5.9 +if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL% +REM clean BUILD directory +if exist "%BUILD_DIR%" rmdir /Q /S %BUILD_DIR% +mkdir %BUILD_DIR% +set PVLIBVERSION=5.10 set python_name=python%PYTHON_VERSION% set CMAKE_OPTIONS= @@ -167,7 +169,7 @@ set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCATALYST_BUILD_STUB_IMPLEMENTATION:BOOL=ON REM allow additional plugins set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_ALL_NEW_OBJECT_FACTORY:BOOL=ON -set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64 cd %BUILD_DIR% echo. diff --git a/products/compil_scripts/ParaView-5.11.0.bat b/products/compil_scripts/ParaView-5.11.0.bat index 1f4db32..76ef2ac 100644 --- a/products/compil_scripts/ParaView-5.11.0.bat +++ b/products/compil_scripts/ParaView-5.11.0.bat @@ -9,19 +9,22 @@ IF NOT DEFINED SAT_DEBUG ( ) IF NOT DEFINED CMAKE_GENERATOR ( - SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64" + SET CMAKE_GENERATOR="Visual Studio 15 2017" ) -if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL% -REM clean BUILD directory -if exist "%BUILD_DIR%" rmdir /Q /S %BUILD_DIR% -mkdir %BUILD_DIR% - SET PRODUCT_BUILD_TYPE=Release +IF DEFINED SAT_CMAKE_BUILD_TYPE ( + SET PRODUCT_BUILD_TYPE=%SAT_CMAKE_BUILD_TYPE% +) if %SAT_DEBUG% == 1 ( set PRODUCT_BUILD_TYPE=Debug ) +if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL% +REM clean BUILD directory +if exist "%BUILD_DIR%" rmdir /Q /S %BUILD_DIR% +mkdir %BUILD_DIR% + set PVLIBVERSION=5.11 set python_name=python%PYTHON_VERSION% @@ -213,7 +216,7 @@ IF DEFINED OT_VERSION ( set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPARAVIEW_ENABLE_OPENTURNS=ON -DOpenTURNS_DIR=%OT_ROOT_DIR:\=/%/lib/cmake/openturns ) -set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64 cd %BUILD_DIR% echo. diff --git a/products/compil_scripts/TTK.bat b/products/compil_scripts/TTK.bat index 2225ac9..6e79557 100644 --- a/products/compil_scripts/TTK.bat +++ b/products/compil_scripts/TTK.bat @@ -9,11 +9,13 @@ IF NOT DEFINED SAT_DEBUG ( ) IF NOT DEFINED CMAKE_GENERATOR ( - SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64" + SET CMAKE_GENERATOR="Visual Studio 15 2017" ) SET PRODUCT_BUILD_TYPE=Release -REM TODO: NGH: not Tested yet +IF DEFINED SAT_CMAKE_BUILD_TYPE ( + SET PRODUCT_BUILD_TYPE=%SAT_CMAKE_BUILD_TYPE% +) if %SAT_DEBUG% == 1 ( set PRODUCT_BUILD_TYPE=Debug ) @@ -31,7 +33,6 @@ set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_LIBDIR:STRING=lib set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DTTK_BUILD_PARAVIEW_PLUGINS=ON set CMAKE_OPTIONS=%CMAKE_OPTIONS% -Dembree_DIR:PATH=%EMBREE_ROOT_DIR:\=/%/lib/cmake/embree-3.12.2 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DEMBREE_INCLUDE_DIR=%EMBREE_ROOT_DIR:\=/%/include -set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR% REM Boost settings set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBOOST_ROOT:PATH=%BOOST_ROOT_DIR:\=/% @@ -40,10 +41,8 @@ set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBOOST_INCLUDEDIR=%Boost_INCLUDE_DIR:\=/% set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBoost_INCLUDE_DIR=%Boost_INCLUDE_DIR:\=/% set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBoost_NO_BOOST_CMAKE:BOOL=ON set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBoost_NO_SYSTEM_PATHS:BOOL=ON -rem SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBoost_USE_STATIC_LIBS=OFF -REM SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_MODULE_ENABLE_ttkCinemaWriter=NO -REM SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_MODULE_ENABLE_ttkCinemaQuery=NO SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBoost_NO_BOOST_CMAKE=ON +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64 cd %BUILD_DIR% echo. @@ -59,7 +58,7 @@ if NOT %ERRORLEVEL% == 0 ( echo. echo -------------------------------------------------------------------------- -echo *** msbuild %MAKE_OPTIONS% /p:Configuration=Release ALL_BUILD.vcxproj +echo *** msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% ALL_BUILD.vcxproj echo -------------------------------------------------------------------------- msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 ALL_BUILD.vcxproj diff --git a/products/compil_scripts/URANIE-4.7.0.bat b/products/compil_scripts/URANIE-4.7.0.bat index b7709db..d55c49c 100644 --- a/products/compil_scripts/URANIE-4.7.0.bat +++ b/products/compil_scripts/URANIE-4.7.0.bat @@ -8,8 +8,14 @@ IF NOT DEFINED SAT_DEBUG ( SET SAT_DEBUG=0 ) +IF NOT DEFINED CMAKE_GENERATOR ( + SET CMAKE_GENERATOR="Visual Studio 15 2017" +) + SET PRODUCT_BUILD_TYPE=Release -REM TODO: NGH: not Tested yet +IF DEFINED SAT_CMAKE_BUILD_TYPE ( + SET PRODUCT_BUILD_TYPE=%SAT_CMAKE_BUILD_TYPE% +) if %SAT_DEBUG% == 1 ( set PRODUCT_BUILD_TYPE=Debug ) @@ -26,7 +32,7 @@ SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE:STRING=%PRODUCT_BUILD_TYPE% SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DWITH-OPT++:BOOL=ON SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DWITH-JSONCPP:BOOL=ON SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -D--enable-doc:BOOL=ON -SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% set CMAKE_OPTIONS=%CMAKE_OPTIONS% -A Win32 -Thost=x64 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -D--enable-WIN32-DEBUG=OFF set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPTHREAD_ROOT_DIR=%PTHREAD_ROOT_DIR:\=/% diff --git a/products/compil_scripts/YDEFX.bat b/products/compil_scripts/YDEFX.bat index 60a4d11..8e63dc0 100644 --- a/products/compil_scripts/YDEFX.bat +++ b/products/compil_scripts/YDEFX.bat @@ -9,12 +9,13 @@ IF NOT DEFINED SAT_DEBUG ( ) IF NOT DEFINED CMAKE_GENERATOR ( - SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64" + SET CMAKE_GENERATOR="Visual Studio 15 2017" ) SET PRODUCT_BUILD_TYPE=Release - -REM TODO: NGH: not Tested yet +IF DEFINED SAT_CMAKE_BUILD_TYPE ( + SET PRODUCT_BUILD_TYPE=%SAT_CMAKE_BUILD_TYPE% +) if %SAT_DEBUG% == 1 ( set PRODUCT_BUILD_TYPE=Debug ) @@ -29,7 +30,7 @@ SET CMAKE_OPTIONS= SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_PREFIX:STRING=%PRODUCT_INSTALL:\=/% set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE:STRING=%PRODUCT_BUILD_TYPE% SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON -set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64 cd %BUILD_DIR% @@ -46,7 +47,7 @@ if NOT %ERRORLEVEL% == 0 ( echo. echo -------------------------------------------------------------------------- -echo *** msbuild %MAKE_OPTIONS% /p:Configuration=Release ALL_BUILD.vcxproj +echo *** msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% ALL_BUILD.vcxproj echo -------------------------------------------------------------------------- msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 ALL_BUILD.vcxproj diff --git a/products/compil_scripts/bsd_xdr.bat b/products/compil_scripts/bsd_xdr.bat index 1c03ee8..19b7248 100755 --- a/products/compil_scripts/bsd_xdr.bat +++ b/products/compil_scripts/bsd_xdr.bat @@ -9,10 +9,13 @@ IF NOT DEFINED SAT_DEBUG ( ) IF NOT DEFINED CMAKE_GENERATOR ( - SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64" + SET CMAKE_GENERATOR="Visual Studio 15 2017" ) -SET PRODUCT_BUILD_TYPE=release +SET PRODUCT_BUILD_TYPE=Release +IF DEFINED SAT_CMAKE_BUILD_TYPE ( + SET PRODUCT_BUILD_TYPE=%SAT_CMAKE_BUILD_TYPE% +) if %SAT_DEBUG% == 1 ( set PRODUCT_BUILD_TYPE=debug @@ -22,7 +25,7 @@ if exist "%PRODUCT_INSTALL%" rmdir /Q /S "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL% set CMAKE_OPTIONS=-DCMAKE_INSTALL_PREFIX:STRING=%PRODUCT_INSTALL:\=/% -set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64 set MSBUILDDISABLENODEREUSE=1 @@ -48,11 +51,11 @@ if NOT %ERRORLEVEL% == 0 ( echo. echo -------------------------------------------------------------------------- -echo *** %CMAKE_ROOT%\bin\cmake --build . --config Release --target INSTALL +echo *** %CMAKE_ROOT%\bin\cmake --build . --config %PRODUCT_BUILD_TYPE% --target INSTALL echo -------------------------------------------------------------------------- echo. -%CMAKE_ROOT%\bin\cmake --build . --config Release --target INSTALL +%CMAKE_ROOT%\bin\cmake --build . --config %PRODUCT_BUILD_TYPE% --target INSTALL if NOT %ERRORLEVEL% == 0 ( echo "ERROR on cmake build" exit 2 diff --git a/products/compil_scripts/cgns.bat b/products/compil_scripts/cgns.bat index 354844b..8faebe0 100755 --- a/products/compil_scripts/cgns.bat +++ b/products/compil_scripts/cgns.bat @@ -9,10 +9,14 @@ IF NOT DEFINED SAT_DEBUG ( ) IF NOT DEFINED CMAKE_GENERATOR ( - SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64" + SET CMAKE_GENERATOR="Visual Studio 15 2017" ) SET PRODUCT_BUILD_TYPE=Release +IF DEFINED SAT_CMAKE_BUILD_TYPE ( + SET PRODUCT_BUILD_TYPE=%SAT_CMAKE_BUILD_TYPE% +) + if %SAT_DEBUG% == 1 ( set PRODUCT_BUILD_TYPE=Debug ) @@ -39,7 +43,7 @@ if "%VERSION%" == "4.2.0" ( SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCGNS_ENABLE_64BIT:BOOL=OFF ) -set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64 cd %BUILD_DIR% diff --git a/products/compil_scripts/cmake.bat b/products/compil_scripts/cmake.bat index 8f4ef55..c7c99d4 100644 --- a/products/compil_scripts/cmake.bat +++ b/products/compil_scripts/cmake.bat @@ -6,7 +6,7 @@ echo ########################################################################## IF NOT DEFINED CMAKE_GENERATOR ( - SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64" + SET CMAKE_GENERATOR="Visual Studio 15 2017" ) if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL% @@ -17,18 +17,19 @@ mkdir %BUILD_DIR% set PLATFORM_TARGET=x64 if "%SALOME_APPLICATION_NAME%" == "URANIE" ( - set PLATFORM_TARGET=Win32 + set PLATFORM_TARGET=Win32 +) +set CMAKE_OPTIONS_EXTRA= -G %CMAKE_GENERATOR% -A x64 +if "%SALOME_APPLICATION_NAME%" == "URANIE" ( + set CMAKE_OPTIONS_EXTRA= -A Win32 -Thost=x64 -DCMAKE_SYSTEM_VERSION=10.0.19041.0 ) rem # Configuration rem # According to cmake README, cmake is mandatory for compiling cmake on windows set CMAKE_OPTIONS=-DCMAKE_INSTALL_PREFIX:STRING=%PRODUCT_INSTALL:\=/% +rem # we build CMake in release mode set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE:STRING=Release -if "%SALOME_APPLICATION_NAME%" == "URANIE" ( - set CMAKE_OPTIONS=%CMAKE_OPTIONS% -A Win32 -Thost=x64 - set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_SYSTEM_VERSION=10.0.19041.0 -) -set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% %CMAKE_OPTIONS_EXTRA% set MSBUILDDISABLENODEREUSE=1 diff --git a/products/compil_scripts/cminpack-1.3.6.bat b/products/compil_scripts/cminpack-1.3.6.bat index 1508c26..134c9c3 100644 --- a/products/compil_scripts/cminpack-1.3.6.bat +++ b/products/compil_scripts/cminpack-1.3.6.bat @@ -9,10 +9,14 @@ IF NOT DEFINED SAT_DEBUG ( ) IF NOT DEFINED CMAKE_GENERATOR ( - SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64" + SET CMAKE_GENERATOR="Visual Studio 15 2017" ) SET PRODUCT_BUILD_TYPE=Release +IF DEFINED SAT_CMAKE_BUILD_TYPE ( + SET PRODUCT_BUILD_TYPE=%SAT_CMAKE_BUILD_TYPE% +) + if %SAT_DEBUG% == 1 ( set PRODUCT_BUILD_TYPE=Debug ) @@ -27,7 +31,7 @@ SET CMAKE_OPTIONS= SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_PREFIX:STRING=%PRODUCT_INSTALL:\=/% set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE:STRING=%PRODUCT_BUILD_TYPE% set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DOpenBLAS_DIR=%OpenBLAS_DIR:\=/% -set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64 cd %BUILD_DIR% diff --git a/products/compil_scripts/eigen.bat b/products/compil_scripts/eigen.bat index 742558d..789fa3d 100644 --- a/products/compil_scripts/eigen.bat +++ b/products/compil_scripts/eigen.bat @@ -9,10 +9,13 @@ IF NOT DEFINED SAT_DEBUG ( ) IF NOT DEFINED CMAKE_GENERATOR ( - SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64" + SET CMAKE_GENERATOR="Visual Studio 15 2017" ) SET PRODUCT_BUILD_TYPE=Release +IF DEFINED SAT_CMAKE_BUILD_TYPE ( + SET PRODUCT_BUILD_TYPE=%SAT_CMAKE_BUILD_TYPE% +) if %SAT_DEBUG% == 1 ( set PRODUCT_BUILD_TYPE=Debug ) @@ -27,7 +30,7 @@ cd %BUILD_DIR% set CMAKE_OPTIONS= SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE:STRING=%PRODUCT_BUILD_TYPE% set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_PREFIX:STRING=%PRODUCT_INSTALL:\=/% -set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64 echo. echo ********************************************************************* diff --git a/products/compil_scripts/fftw-3.3.9.bat b/products/compil_scripts/fftw-3.3.9.bat index ee1edcb..e63f162 100644 --- a/products/compil_scripts/fftw-3.3.9.bat +++ b/products/compil_scripts/fftw-3.3.9.bat @@ -9,10 +9,14 @@ IF NOT DEFINED SAT_DEBUG ( ) IF NOT DEFINED CMAKE_GENERATOR ( - SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64" + SET CMAKE_GENERATOR="Visual Studio 15 2017" ) SET PRODUCT_BUILD_TYPE=Release +IF DEFINED SAT_CMAKE_BUILD_TYPE ( + SET PRODUCT_BUILD_TYPE=%SAT_CMAKE_BUILD_TYPE% +) + if %SAT_DEBUG% == 1 ( set PRODUCT_BUILD_TYPE=Debug ) @@ -25,7 +29,8 @@ mkdir %BUILD_DIR% SET CMAKE_OPTIONS= SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_PREFIX:STRING=%PRODUCT_INSTALL:\=/% set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE:STRING=%PRODUCT_BUILD_TYPE% -set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -A x64 cd %BUILD_DIR% set PATH=%BUILD_DIR%\bin;%PATH% @@ -43,7 +48,7 @@ if NOT %ERRORLEVEL% == 0 ( echo. echo -------------------------------------------------------------------------- -echo *** msbuild %MAKE_OPTIONS% /p:Configuration=Release /p:Platform=x64 ALL_BUILD.vcxproj +echo *** msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 ALL_BUILD.vcxproj echo -------------------------------------------------------------------------- msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 ALL_BUILD.vcxproj diff --git a/products/compil_scripts/fftw.bat b/products/compil_scripts/fftw.bat index 389ea6b..143e489 100644 --- a/products/compil_scripts/fftw.bat +++ b/products/compil_scripts/fftw.bat @@ -8,9 +8,15 @@ IF NOT DEFINED SAT_DEBUG ( SET SAT_DEBUG=0 ) +IF NOT DEFINED CMAKE_GENERATOR ( + SET CMAKE_GENERATOR="Visual Studio 15 2017" +) + SET PRODUCT_BUILD_TYPE=Release +IF DEFINED SAT_CMAKE_BUILD_TYPE ( + SET PRODUCT_BUILD_TYPE=%SAT_CMAKE_BUILD_TYPE% +) -REM TODO: NGH: not Tested yet if %SAT_DEBUG% == 1 ( set PRODUCT_BUILD_TYPE=Debug ) @@ -23,8 +29,7 @@ mkdir %BUILD_DIR% SET CMAKE_OPTIONS= SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_PREFIX:STRING=%PRODUCT_INSTALL:\=/% set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE:STRING=%PRODUCT_BUILD_TYPE% -set CMAKE_OPTIONS=%CMAKE_OPTIONS% -A Win32 -Thost=x64 -set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_SYSTEM_VERSION=10.0.19041.0 +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -A Win32 -Thost=x64 -DCMAKE_SYSTEM_VERSION=10.0.19041.0 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR% cd %BUILD_DIR% @@ -43,7 +48,7 @@ if NOT %ERRORLEVEL% == 0 ( echo. echo -------------------------------------------------------------------------- -echo *** msbuild %MAKE_OPTIONS% /p:Configuration=Release /p:Platform=x86 ALL_BUILD.vcxproj +echo *** msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 ALL_BUILD.vcxproj echo -------------------------------------------------------------------------- msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x86 ALL_BUILD.vcxproj @@ -54,7 +59,7 @@ if NOT %ERRORLEVEL% == 0 ( echo. echo -------------------------------------------------------------------------- -echo *** msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x86 INSTALL.vcxproj +echo *** msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 INSTALL.vcxproj echo -------------------------------------------------------------------------- msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x86 INSTALL.vcxproj diff --git a/products/compil_scripts/freetype.bat b/products/compil_scripts/freetype.bat index 8f1ef44..3fba99d 100755 --- a/products/compil_scripts/freetype.bat +++ b/products/compil_scripts/freetype.bat @@ -8,7 +8,15 @@ IF NOT DEFINED SAT_DEBUG ( SET SAT_DEBUG=0 ) +IF NOT DEFINED CMAKE_GENERATOR ( + SET CMAKE_GENERATOR="Visual Studio 15 2017" +) + SET PRODUCT_BUILD_TYPE=Release +IF DEFINED SAT_CMAKE_BUILD_TYPE ( + SET PRODUCT_BUILD_TYPE=%SAT_CMAKE_BUILD_TYPE% +) + if %SAT_DEBUG% == 1 ( set PRODUCT_BUILD_TYPE=Debug ) @@ -18,6 +26,12 @@ if "%SALOME_APPLICATION_NAME%" == "URANIE" ( set PLATFORM_TARGET=Win32 ) +set CMAKE_OPTIONS_EXTRA= -G %CMAKE_GENERATOR% -A x64 +if "%SALOME_APPLICATION_NAME%" == "URANIE" ( + set CMAKE_OPTIONS_EXTRA= -A Win32 -Thost=x64 -DCMAKE_SYSTEM_VERSION=10.0.19041.0 +) + + if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL% REM clean BUILD directory @@ -30,10 +44,7 @@ set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_PREFIX=%PRODUCT_INSTALL% set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE=%PRODUCT_BUILD_TYPE% set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBUILD_SHARED_LIBS=ON set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_DISABLE_FIND_PACKAGE_HarfBuzz=TRUE -if %PLATFORM_TARGET% == Win32 ( - set CMAKE_OPTIONS=%CMAKE_OPTIONS% -A Win32 -Thost=x64 -DCMAKE_SYSTEM_VERSION=10.0.19041.0 -) -set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR:STRING=%CMAKE_GENERATOR% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% %CMAKE_OPTIONS_EXTRA% set MSBUILDDISABLENODEREUSE=1 diff --git a/products/compil_scripts/gl2ps.bat b/products/compil_scripts/gl2ps.bat index 05438db..b392d61 100755 --- a/products/compil_scripts/gl2ps.bat +++ b/products/compil_scripts/gl2ps.bat @@ -9,14 +9,17 @@ IF NOT DEFINED SAT_DEBUG ( ) IF NOT DEFINED CMAKE_GENERATOR ( - SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64" + SET CMAKE_GENERATOR="Visual Studio 15 2017" ) SET PRODUCT_BUILD_TYPE=Release -REM TODO: NGH: not Tested yet -REM if %SAT_DEBUG% == 1 ( -REM set PRODUCT_BUILD_TYPE=Debug -REM ) +IF DEFINED SAT_CMAKE_BUILD_TYPE ( + SET PRODUCT_BUILD_TYPE=%SAT_CMAKE_BUILD_TYPE% +) + +if %SAT_DEBUG% == 1 ( + set PRODUCT_BUILD_TYPE=Debug +) if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL% if NOT exist "%PRODUCT_INSTALL%\bin" mkdir %PRODUCT_INSTALL%\bin @@ -29,7 +32,7 @@ SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE:STRING=%PRODUCT_BUILD_TYPE% set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DENABLE_GLUT=OFF set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DENABLE_PNG=ON set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DENABLE_ZLIB=ON -set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64 set MSBUILDDISABLENODEREUSE=1 diff --git a/products/compil_scripts/gmsh-4.10.3.bat b/products/compil_scripts/gmsh-4.10.3.bat index d00f196..3ce5f51 100644 --- a/products/compil_scripts/gmsh-4.10.3.bat +++ b/products/compil_scripts/gmsh-4.10.3.bat @@ -9,11 +9,14 @@ IF NOT DEFINED SAT_DEBUG ( ) IF NOT DEFINED CMAKE_GENERATOR ( - SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64" + SET CMAKE_GENERATOR="Visual Studio 15 2017" ) -SET PRODUCT_BUILD_TYPE=Release SET BUILD_SHARED=ON +SET PRODUCT_BUILD_TYPE=Release +IF DEFINED SAT_CMAKE_BUILD_TYPE ( + SET PRODUCT_BUILD_TYPE=%SAT_CMAKE_BUILD_TYPE% +) if %SAT_DEBUG% == 1 ( set PRODUCT_BUILD_TYPE=Debug set BUILD_SHARED=OFF @@ -43,7 +46,7 @@ set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DENABLE_CGNS=ON set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DENABLE_TESTS=OFF set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DENABLE_PLUGINS=OFF set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DENABLE_OPENMP=OFF -set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR:STRING=%CMAKE_GENERATOR% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64 set MSBUILDDISABLENODEREUSE=1 echo. diff --git a/products/compil_scripts/gmsh-4.8.4.bat b/products/compil_scripts/gmsh-4.8.4.bat index 889044e..0703dad 100644 --- a/products/compil_scripts/gmsh-4.8.4.bat +++ b/products/compil_scripts/gmsh-4.8.4.bat @@ -9,11 +9,15 @@ IF NOT DEFINED SAT_DEBUG ( ) IF NOT DEFINED CMAKE_GENERATOR ( - SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64" + SET CMAKE_GENERATOR="Visual Studio 15 2017" ) -SET PRODUCT_BUILD_TYPE=Release SET BUILD_SHARED=ON +SET PRODUCT_BUILD_TYPE=Release +IF DEFINED SAT_CMAKE_BUILD_TYPE ( + SET PRODUCT_BUILD_TYPE=%SAT_CMAKE_BUILD_TYPE% +) + if %SAT_DEBUG% == 1 ( set PRODUCT_BUILD_TYPE=Debug set BUILD_SHARED=OFF @@ -42,7 +46,9 @@ set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DENABLE_PRIVATE_API=ON set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DENABLE_CGNS=OFF set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DENABLE_TESTS=OFF set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DENABLE_PLUGINS=OFF -set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -A x64 + set MSBUILDDISABLENODEREUSE=1 echo. diff --git a/products/compil_scripts/gmsh.bat b/products/compil_scripts/gmsh.bat index c1aea9f..3da574d 100644 --- a/products/compil_scripts/gmsh.bat +++ b/products/compil_scripts/gmsh.bat @@ -9,7 +9,7 @@ IF NOT DEFINED SAT_DEBUG ( ) IF NOT DEFINED CMAKE_GENERATOR ( - SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64" + SET CMAKE_GENERATOR="Visual Studio 15 2017" ) SET PRODUCT_BUILD_TYPE=Release @@ -43,8 +43,8 @@ set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DENABLE_CGNS=OFF set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DENABLE_HXT=OFF set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DENABLE_SOLVER=ON set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DENABLE_GMM=ON -set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR% set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DENABLE_BLAS_LAPACK=OFF +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64 set MSBUILDDISABLENODEREUSE=1 echo. @@ -61,11 +61,11 @@ if NOT %ERRORLEVEL% == 0 ( echo. echo ********************************************************************* -echo *** msbuild %MAKE_OPTIONS% /p:Configuration=Release /p:Platform=x64 ALL_BUILD.vcxproj" +echo *** msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 ALL_BUILD.vcxproj echo ********************************************************************* echo. -msbuild %MAKE_OPTIONS% /p:Configuration=Release /p:Platform=x64 ALL_BUILD.vcxproj +msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 ALL_BUILD.vcxproj if NOT %ERRORLEVEL% == 0 ( echo ERROR on msbuild gmsh.vcxproj exit 2 @@ -77,7 +77,7 @@ echo *** installation... echo ********************************************************************* echo. -msbuild %MAKE_OPTIONS% /p:Configuration=Release /p:Platform=x64 INSTALL.vcxproj +msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 INSTALL.vcxproj if NOT %ERRORLEVEL% == 0 ( echo ERROR on msbuild INSTALL.vcxproj exit 3 @@ -88,14 +88,14 @@ echo ********************************************************************* echo *** installation Headers... echo ********************************************************************* echo. -msbuild /p:Configuration=Release /p:Platform=x64 /p:BuildProjectReferences=false get_headers.vcxproj +msbuild /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 /p:BuildProjectReferences=false get_headers.vcxproj if NOT %ERRORLEVEL% == 0 ( echo ERROR on msbuild get_headers.vcxproj exit 4 ) -copy /Y /B %BUILD_DIR%\Release\gmsh.lib %PRODUCT_INSTALL%\bin\gmsh.lib -copy /Y /B %BUILD_DIR%\Release\gmsh.exp %PRODUCT_INSTALL%\bin\gmsh.exp +copy /Y /B %BUILD_DIR%\%PRODUCT_BUILD_TYPE%\gmsh.lib %PRODUCT_INSTALL%\bin\gmsh.lib +copy /Y /B %BUILD_DIR%\%PRODUCT_BUILD_TYPE%\gmsh.exp %PRODUCT_INSTALL%\bin\gmsh.exp SETLOCAL ENABLEDELAYEDEXPANSION FOR %%f IN (gmsh.h gmsh.h_cwrap gmshc.h) do ( diff --git a/products/compil_scripts/graphviz-2.44.1.bat b/products/compil_scripts/graphviz-2.44.1.bat index d8c585d..1cb6ac4 100644 --- a/products/compil_scripts/graphviz-2.44.1.bat +++ b/products/compil_scripts/graphviz-2.44.1.bat @@ -9,11 +9,14 @@ IF NOT DEFINED SAT_DEBUG ( ) IF NOT DEFINED CMAKE_GENERATOR ( - SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64" + SET CMAKE_GENERATOR="Visual Studio 15 2017" ) SET PRODUCT_BUILD_TYPE=Release -REM TODO: NGH: not Tested yet +IF DEFINED SAT_CMAKE_BUILD_TYPE ( + SET PRODUCT_BUILD_TYPE=%SAT_CMAKE_BUILD_TYPE% +) + if %SAT_DEBUG% == 1 ( set PRODUCT_BUILD_TYPE=Debug ) @@ -31,7 +34,7 @@ set CMAKE_OPTIONS= set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_PREFIX=%PRODUCT_INSTALL% set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE=%PRODUCT_BUILD_TYPE% set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBUILD_SHARED_LIBS:BOOL=ON -set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64 set MSBUILDDISABLENODEREUSE=1 @@ -49,10 +52,10 @@ if NOT %ERRORLEVEL% == 0 ( echo. echo ********************************************************************* -echo *** msbuild %MAKE_OPTIONS% /p:Configuration=Release /p:Platform=x64 ALL_BUILD.vcxproj +echo *** msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 ALL_BUILD.vcxproj echo ********************************************************************* echo. -msbuild %MAKE_OPTIONS% /p:Configuration=Release /p:Platform=x64 ALL_BUILD.vcxproj +msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 ALL_BUILD.vcxproj if NOT %ERRORLEVEL% == 0 ( echo ERROR on msbuild ALL_BUILD.vcxproj exit 2 @@ -63,7 +66,7 @@ echo ********************************************************************* echo *** installation... echo ********************************************************************* echo. -msbuild %MAKE_OPTIONS% /p:Configuration=Release /p:Platform=x64 INSTALL.vcxproj +msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 INSTALL.vcxproj if NOT %ERRORLEVEL% == 0 ( echo ERROR on msbuild INSTALL.vcxproj exit 3 diff --git a/products/compil_scripts/graphviz.bat b/products/compil_scripts/graphviz.bat index fa5e15e..a0ee754 100644 --- a/products/compil_scripts/graphviz.bat +++ b/products/compil_scripts/graphviz.bat @@ -9,14 +9,18 @@ IF NOT DEFINED SAT_DEBUG ( ) IF NOT DEFINED CMAKE_GENERATOR ( - SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64" + SET CMAKE_GENERATOR="Visual Studio 15 2017" ) SET PRODUCT_BUILD_TYPE=Release -REM TODO: NGH: not Tested yet -REM if %SAT_DEBUG% == 1 ( -REM set PRODUCT_BUILD_TYPE=Debug -REM ) +IF DEFINED SAT_CMAKE_BUILD_TYPE ( + SET PRODUCT_BUILD_TYPE=%SAT_CMAKE_BUILD_TYPE% +) + +if %SAT_DEBUG% == 1 ( + set PRODUCT_BUILD_TYPE=Debug +) + if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL% REM clean BUILD directory if exist "%BUILD_DIR%" rmdir /Q /S %BUILD_DIR% @@ -27,7 +31,7 @@ cd %BUILD_DIR% set CMAKE_OPTIONS= set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_PREFIX=%PRODUCT_INSTALL% set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE=%PRODUCT_BUILD_TYPE% -set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64 set MSBUILDDISABLENODEREUSE=1 @@ -45,10 +49,10 @@ if NOT %ERRORLEVEL% == 0 ( echo. echo ********************************************************************* -echo *** msbuild %MAKE_OPTIONS% /p:Configuration=Release /p:Platform=x64 ALL_BUILD.vcxproj +echo *** msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 ALL_BUILD.vcxproj echo ********************************************************************* echo. -msbuild %MAKE_OPTIONS% /p:Configuration=Release /p:Platform=x64 ALL_BUILD.vcxproj +msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 ALL_BUILD.vcxproj if NOT %ERRORLEVEL% == 0 ( echo ERROR on msbuild ALL_BUILD.vcxproj exit 2 @@ -59,7 +63,7 @@ echo ********************************************************************* echo *** installation... echo ********************************************************************* echo. -msbuild %MAKE_OPTIONS% /p:Configuration=Release /p:Platform=x64 INSTALL.vcxproj +msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 INSTALL.vcxproj if NOT %ERRORLEVEL% == 0 ( echo ERROR on msbuild INSTALL.vcxproj exit 3 diff --git a/products/compil_scripts/hdf5CMake.bat b/products/compil_scripts/hdf5CMake.bat index 904a4ae..e7e9ea1 100755 --- a/products/compil_scripts/hdf5CMake.bat +++ b/products/compil_scripts/hdf5CMake.bat @@ -9,10 +9,14 @@ IF NOT DEFINED SAT_DEBUG ( ) IF NOT DEFINED CMAKE_GENERATOR ( - SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64" + SET CMAKE_GENERATOR="Visual Studio 15 2017" ) SET PRODUCT_BUILD_TYPE=Release +IF DEFINED SAT_CMAKE_BUILD_TYPE ( + SET PRODUCT_BUILD_TYPE=%SAT_CMAKE_BUILD_TYPE% +) + if %SAT_DEBUG% == 1 ( set PRODUCT_BUILD_TYPE=Debug ) @@ -38,7 +42,7 @@ if DEFINED SAT_HPC ( ) else ( SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DHDF5_ENABLE_PARALLEL:BOOL=OFF ) -set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64 set MSBUILDDISABLENODEREUSE=1 diff --git a/products/compil_scripts/ispc.bat b/products/compil_scripts/ispc.bat index dac40fa..89cc241 100644 --- a/products/compil_scripts/ispc.bat +++ b/products/compil_scripts/ispc.bat @@ -9,7 +9,7 @@ IF NOT DEFINED SAT_DEBUG ( ) IF NOT DEFINED CMAKE_GENERATOR ( - SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64" + SET CMAKE_GENERATOR="Visual Studio 15 2017" ) SET PRODUCT_BUILD_TYPE=Release @@ -37,7 +37,7 @@ SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_PREFIX:STRING=%PRODUCT_INSTALL SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE:STRING=%PRODUCT_BUILD_TYPE% SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPYTHON_EXECUTABLE=%PYTHON_ROOT_DIR:\=/%/python.exe -SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR% +SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64 cd %BUILD_DIR% diff --git a/products/compil_scripts/lapack.bat b/products/compil_scripts/lapack.bat index 339e321..28d694d 100644 --- a/products/compil_scripts/lapack.bat +++ b/products/compil_scripts/lapack.bat @@ -9,6 +9,10 @@ IF NOT DEFINED SAT_DEBUG ( ) SET PRODUCT_BUILD_TYPE=Release +IF DEFINED SAT_CMAKE_BUILD_TYPE ( + SET PRODUCT_BUILD_TYPE=%SAT_CMAKE_BUILD_TYPE% +) + if %SAT_DEBUG% == 1 ( set PRODUCT_BUILD_TYPE=Debug ) diff --git a/products/compil_scripts/lata.bat b/products/compil_scripts/lata.bat index db0f2c2..cc98669 100644 --- a/products/compil_scripts/lata.bat +++ b/products/compil_scripts/lata.bat @@ -5,7 +5,7 @@ echo Installing LATA %VERSION% echo ########################################################################## IF NOT DEFINED CMAKE_GENERATOR ( - SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64" + SET CMAKE_GENERATOR="Visual Studio 15 2017" ) if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL% @@ -56,8 +56,8 @@ echo INFO: running cmake -DVisItBridgePlugin_SOURCE_DIR=%BUILD_DIR%\VisItLib cd %BUILD_DIR%\build_paraview SET CMAKE_OPTIONS=-DCMAKE_BUILD_TYPE:STRING=Release -SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR% SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVisItBridgePlugin_SOURCE_DIR=%BUILD_DIR:\=/%/VisItLib +SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64 cmake %CMAKE_OPTIONS% if NOT %ERRORLEVEL% == 0 ( echo ERROR: failed to run command: cmake %CMAKE_OPTIONS% diff --git a/products/compil_scripts/llvm-8.0.1.bat b/products/compil_scripts/llvm-8.0.1.bat index 5ebb2c9..2e3a603 100644 --- a/products/compil_scripts/llvm-8.0.1.bat +++ b/products/compil_scripts/llvm-8.0.1.bat @@ -5,7 +5,7 @@ echo llvm %VERSION% echo ########################################################################## IF NOT DEFINED CMAKE_GENERATOR ( - SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64" + SET CMAKE_GENERATOR="Visual Studio 15 2017" ) REM NGH: no need to build this in debug mode @@ -25,7 +25,7 @@ set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPYTHON_EXECUTABLE:STRING=%PYTHON_ROOT_DIR:\= set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DLLVM_INSTALL_UTILS:BOOL=ON set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DLLVM_ENABLE_DUMP:BOOL=ON set CMAKE_OPTIONS=%CMAKE_OPTIONS% -Thost=x64 -set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64 set MSBUILDDISABLENODEREUSE=1 echo. diff --git a/products/compil_scripts/medCMake.bat b/products/compil_scripts/medCMake.bat index 883450f..29bab8a 100755 --- a/products/compil_scripts/medCMake.bat +++ b/products/compil_scripts/medCMake.bat @@ -9,10 +9,14 @@ IF NOT DEFINED SAT_DEBUG ( ) IF NOT DEFINED CMAKE_GENERATOR ( - SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64" + SET CMAKE_GENERATOR="Visual Studio 15 2017" ) SET PRODUCT_BUILD_TYPE=Release +IF DEFINED SAT_CMAKE_BUILD_TYPE ( + SET PRODUCT_BUILD_TYPE=%SAT_CMAKE_BUILD_TYPE% +) + if %SAT_DEBUG% == 1 ( set PRODUCT_BUILD_TYPE=Debug ) @@ -39,7 +43,7 @@ if DEFINED SAT_HPC ( SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DMEDFILE_USE_MPI:BOOL=OFF ) -SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR% +SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64 cd %BUILD_DIR% diff --git a/products/compil_scripts/metis-5.1.0.bat b/products/compil_scripts/metis-5.1.0.bat index cc71344..3d2534e 100755 --- a/products/compil_scripts/metis-5.1.0.bat +++ b/products/compil_scripts/metis-5.1.0.bat @@ -9,14 +9,17 @@ IF NOT DEFINED SAT_DEBUG ( ) IF NOT DEFINED CMAKE_GENERATOR ( - SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64" + SET CMAKE_GENERATOR="Visual Studio 15 2017" ) SET PRODUCT_BUILD_TYPE=Release -REM TODO: NGH: not Tested yet -REM if %SAT_DEBUG% == 1 ( -REM set PRODUCT_BUILD_TYPE=Debug -REM ) +IF DEFINED SAT_CMAKE_BUILD_TYPE ( + SET PRODUCT_BUILD_TYPE=%SAT_CMAKE_BUILD_TYPE% +) + +if %SAT_DEBUG% == 1 ( + set PRODUCT_BUILD_TYPE=Debug +) REM ensure that the installation directory does exist if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL% @@ -29,8 +32,8 @@ if exist "%BUILD_DIR%" rmdir /Q /S %BUILD_DIR% mkdir %BUILD_DIR% cd %BUILD_DIR% -set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR% set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE:STRING=%PRODUCT_BUILD_TYPE% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64 set MSBUILDDISABLENODEREUSE=1 diff --git a/products/compil_scripts/netcdf-4.6.2.bat b/products/compil_scripts/netcdf-4.6.2.bat index fcb1428..ad4afbb 100644 --- a/products/compil_scripts/netcdf-4.6.2.bat +++ b/products/compil_scripts/netcdf-4.6.2.bat @@ -9,12 +9,14 @@ IF NOT DEFINED SAT_DEBUG ( ) IF NOT DEFINED CMAKE_GENERATOR ( - SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64" + SET CMAKE_GENERATOR="Visual Studio 15 2017" ) SET PRODUCT_BUILD_TYPE=Release +IF DEFINED SAT_CMAKE_BUILD_TYPE ( + SET PRODUCT_BUILD_TYPE=%SAT_CMAKE_BUILD_TYPE% +) -REM TODO: NGH: not Tested yet if %SAT_DEBUG% == 1 ( set PRODUCT_BUILD_TYPE=Debug ) @@ -43,7 +45,7 @@ set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DLIBXML2_XMLLINT_EXECUTABLE=%LIBXML2_ROOT_DIR set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DHDF5_DIR:PATH=%HDF5_ROOT_DIR:\=/%/cmake/hdf5 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DHDF5_INCLUDE_DIRS:PATH=%HDF5_ROOT_DIR:\=/%/include set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DHDF5_USE_STATIC_LIBRARIES:BOOL=OFF -set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64 set MSBUILDDISABLENODEREUSE=1 echo. @@ -60,11 +62,11 @@ if NOT %ERRORLEVEL% == 0 ( echo. echo ********************************************************************* -echo *** msbuild %MAKE_OPTIONS% /p:Configuration=Release /p:Platform=x64 ALL_BUILD.vcxproj +echo *** msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 ALL_BUILD.vcxproj echo ********************************************************************* echo. -msbuild %MAKE_OPTIONS% /p:Configuration=Release /p:Platform=x64 ALL_BUILD.vcxproj +msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 ALL_BUILD.vcxproj if NOT %ERRORLEVEL% == 0 ( echo ERROR on msbuild ALL_BUILD.vcxproj exit 2 @@ -76,7 +78,7 @@ echo *** installation... echo ********************************************************************* echo. -msbuild %MAKE_OPTIONS% /p:Configuration=Release /p:Platform=x64 INSTALL.vcxproj +msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 INSTALL.vcxproj if NOT %ERRORLEVEL% == 0 ( echo ERROR on msbuild INSTALL.vcxproj exit 3 diff --git a/products/compil_scripts/netgen-6.2.2101.bat b/products/compil_scripts/netgen-6.2.2101.bat index 5abd8a5..0704f49 100644 --- a/products/compil_scripts/netgen-6.2.2101.bat +++ b/products/compil_scripts/netgen-6.2.2101.bat @@ -9,10 +9,13 @@ IF NOT DEFINED SAT_DEBUG ( ) IF NOT DEFINED CMAKE_GENERATOR ( - SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64" + SET CMAKE_GENERATOR="Visual Studio 15 2017" ) SET PRODUCT_BUILD_TYPE=Release +IF DEFINED SAT_CMAKE_BUILD_TYPE ( + SET PRODUCT_BUILD_TYPE=%SAT_CMAKE_BUILD_TYPE% +) if %SAT_DEBUG% == 1 ( set PRODUCT_BUILD_TYPE=Debug ) @@ -39,7 +42,7 @@ cd %CMAKE_PRODUCT_BUILD_DIR% set CMAKE_OPTIONS=-DCMAKE_INSTALL_PREFIX:STRING=%CMAKE_PRODUCT_INSTALL_DIR:\=/% set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE:STRING=Release -set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64 echo. echo -------------------------------------------------------------------------- @@ -98,7 +101,7 @@ set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DUSE_NATIVE_ARCH=OFF set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_CXX_STANDARD=17 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_PREFIX=%PRODUCT_INSTALL:\=/% set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE=%PRODUCT_BUILD_TYPE% -set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64 set MSBUILDDISABLENODEREUSE=1 diff --git a/products/compil_scripts/netgen.bat b/products/compil_scripts/netgen.bat index 3054ea8..9094681 100644 --- a/products/compil_scripts/netgen.bat +++ b/products/compil_scripts/netgen.bat @@ -9,10 +9,13 @@ IF NOT DEFINED SAT_DEBUG ( ) IF NOT DEFINED CMAKE_GENERATOR ( - SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64" + SET CMAKE_GENERATOR="Visual Studio 15 2017" ) SET PRODUCT_BUILD_TYPE=Release +IF DEFINED SAT_CMAKE_BUILD_TYPE ( + SET PRODUCT_BUILD_TYPE=%SAT_CMAKE_BUILD_TYPE% +) if %SAT_DEBUG% == 1 ( set PRODUCT_BUILD_TYPE=Debug ) @@ -30,7 +33,7 @@ set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_PREFIX=%PRODUCT_INSTALL% set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE=%PRODUCT_BUILD_TYPE% set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DZLIB_ROOT_DIR=%ZLIB_DIR% set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCASROOT=%CASROOT% -set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64 set MSBUILDDISABLENODEREUSE=1 diff --git a/products/compil_scripts/netgen_5_3_1.bat b/products/compil_scripts/netgen_5_3_1.bat index 9b9f1e3..a747285 100755 --- a/products/compil_scripts/netgen_5_3_1.bat +++ b/products/compil_scripts/netgen_5_3_1.bat @@ -9,7 +9,7 @@ IF NOT DEFINED SAT_DEBUG ( ) IF NOT DEFINED CMAKE_GENERATOR ( - SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64" + SET CMAKE_GENERATOR="Visual Studio 15 2017" ) SET PRODUCT_BUILD_TYPE=Release @@ -33,11 +33,10 @@ dos2unix -q %SOURCE_DIR%/libsrc/occ/* dos2unix -q %SOURCE_DIR%/libsrc/nglib/* set CMAKE_OPTIONS=-DCMAKE_INSTALL_PREFIX:STRING=%PRODUCT_INSTALL:\=/% -set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR% -set MSBUILDDISABLENODEREUSE=1 - set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DZLIB_ROOT_DIR=%ZLIB_DIR% set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCASROOT=%CASROOT% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64 +set MSBUILDDISABLENODEREUSE=1 cd %BUILD_DIR% diff --git a/products/compil_scripts/nlopt-2.5.0.bat b/products/compil_scripts/nlopt-2.5.0.bat index bbfa6cc..318b0dc 100644 --- a/products/compil_scripts/nlopt-2.5.0.bat +++ b/products/compil_scripts/nlopt-2.5.0.bat @@ -9,6 +9,9 @@ IF NOT DEFINED SAT_DEBUG ( ) SET PRODUCT_BUILD_TYPE=Release +IF DEFINED SAT_CMAKE_BUILD_TYPE ( + SET PRODUCT_BUILD_TYPE=%SAT_CMAKE_BUILD_TYPE% +) if %SAT_DEBUG% == 1 ( set PRODUCT_BUILD_TYPE=Debug ) @@ -18,6 +21,11 @@ if "%SALOME_APPLICATION_NAME%" == "URANIE" ( set PLATFORM_TARGET=Win32 ) +set CMAKE_OPTIONS_EXTRA= -G %CMAKE_GENERATOR% -A x64 +if "%SALOME_APPLICATION_NAME%" == "URANIE" ( + set CMAKE_OPTIONS_EXTRA= -A Win32 -Thost=x64 -DCMAKE_SYSTEM_VERSION=10.0.19041.0 -G %CMAKE_GENERATOR% +) + if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL% REM clean BUILD directory if exist "%BUILD_DIR%" rmdir /Q /S %BUILD_DIR% @@ -32,10 +40,7 @@ set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DNLOPT_MATLAB:BOOL=OFF set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DNLOPT_OCTAVE:BOOL=OFF set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DNLOPT_GUILE:BOOL=OFF set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DSWIG_EXECUTABLE=%SWIG_ROOT_DIR:\=/%/bin/swig.exe -if %PLATFORM_TARGET% == Win32 ( - set CMAKE_OPTIONS=%CMAKE_OPTIONS% -A Win32 -Thost=x64 -DCMAKE_SYSTEM_VERSION=10.0.19041.0 -) -set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR:STRING=%CMAKE_GENERATOR% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% %CMAKE_OPTIONS_EXTRA% set MSBUILDDISABLENODEREUSE=1 diff --git a/products/compil_scripts/nlopt.bat b/products/compil_scripts/nlopt.bat index bbfa6cc..d6c3d3f 100644 --- a/products/compil_scripts/nlopt.bat +++ b/products/compil_scripts/nlopt.bat @@ -8,7 +8,14 @@ IF NOT DEFINED SAT_DEBUG ( SET SAT_DEBUG=0 ) +IF NOT DEFINED CMAKE_GENERATOR ( + SET CMAKE_GENERATOR="Visual Studio 15 2017" +) + SET PRODUCT_BUILD_TYPE=Release +IF DEFINED SAT_CMAKE_BUILD_TYPE ( + SET PRODUCT_BUILD_TYPE=%SAT_CMAKE_BUILD_TYPE% +) if %SAT_DEBUG% == 1 ( set PRODUCT_BUILD_TYPE=Debug ) @@ -18,6 +25,11 @@ if "%SALOME_APPLICATION_NAME%" == "URANIE" ( set PLATFORM_TARGET=Win32 ) +set CMAKE_OPTIONS_EXTRA= -G %CMAKE_GENERATOR% -A x64 +if "%SALOME_APPLICATION_NAME%" == "URANIE" ( + set CMAKE_OPTIONS_EXTRA= -A Win32 -Thost=x64 -DCMAKE_SYSTEM_VERSION=10.0.19041.0 -G %CMAKE_GENERATOR% +) + if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL% REM clean BUILD directory if exist "%BUILD_DIR%" rmdir /Q /S %BUILD_DIR% @@ -32,10 +44,7 @@ set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DNLOPT_MATLAB:BOOL=OFF set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DNLOPT_OCTAVE:BOOL=OFF set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DNLOPT_GUILE:BOOL=OFF set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DSWIG_EXECUTABLE=%SWIG_ROOT_DIR:\=/%/bin/swig.exe -if %PLATFORM_TARGET% == Win32 ( - set CMAKE_OPTIONS=%CMAKE_OPTIONS% -A Win32 -Thost=x64 -DCMAKE_SYSTEM_VERSION=10.0.19041.0 -) -set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR:STRING=%CMAKE_GENERATOR% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% %CMAKE_OPTIONS_EXTRA% set MSBUILDDISABLENODEREUSE=1 diff --git a/products/compil_scripts/openVKL-0.11.0.bat b/products/compil_scripts/openVKL-0.11.0.bat index e29f1c0..9b3cc32 100644 --- a/products/compil_scripts/openVKL-0.11.0.bat +++ b/products/compil_scripts/openVKL-0.11.0.bat @@ -9,13 +9,15 @@ IF NOT DEFINED SAT_DEBUG ( ) IF NOT DEFINED CMAKE_GENERATOR ( - SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64" + SET CMAKE_GENERATOR="Visual Studio 15 2017" ) SET PRODUCT_BUILD_TYPE=Release -REM Building openVKL in DEBUG mode is definitely not relevant. +IF DEFINED SAT_CMAKE_BUILD_TYPE ( + SET PRODUCT_BUILD_TYPE=%SAT_CMAKE_BUILD_TYPE% +) if %SAT_DEBUG% == 1 ( - set PRODUCT_BUILD_TYPE=Debug + set PRODUCT_BUILD_TYPE=Debug ) if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL% @@ -38,7 +40,7 @@ SET CMAKE_OPYIONS=%CMAKE_OPTIONS% -DBUILD_RKCOMMON=OFF SET CMAKE_OPYIONS=%CMAKE_OPTIONS% -DBUILD_EMBREE=OFF SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_PREFIX_PATH:PATH=${CMAKE_PREFIX_PATH} SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DRKCOMMON_TBB_ROOT=%TBB_ROOT_DIR:\=/% -SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR% +SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64 cd %BUILD_DIR% echo. diff --git a/products/compil_scripts/openblas-0.3.23.bat b/products/compil_scripts/openblas-0.3.23.bat index a7251c6..dbe6fb6 100644 --- a/products/compil_scripts/openblas-0.3.23.bat +++ b/products/compil_scripts/openblas-0.3.23.bat @@ -9,11 +9,13 @@ IF NOT DEFINED SAT_DEBUG ( ) IF NOT DEFINED CMAKE_GENERATOR ( - SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64" + SET CMAKE_GENERATOR="Visual Studio 15 2017" ) SET PRODUCT_BUILD_TYPE=Release -REM TODO: NGH: not Tested yet +IF DEFINED SAT_CMAKE_BUILD_TYPE ( + SET PRODUCT_BUILD_TYPE=%SAT_CMAKE_BUILD_TYPE% +) if %SAT_DEBUG% == 1 ( set PRODUCT_BUILD_TYPE=Debug ) @@ -27,7 +29,7 @@ mkdir %BUILD_DIR% SET CMAKE_OPTIONS= SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_PREFIX:STRING=%PRODUCT_INSTALL:\=/% set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE:STRING=%PRODUCT_BUILD_TYPE% -set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64 cd %BUILD_DIR% @@ -44,7 +46,7 @@ if NOT %ERRORLEVEL% == 0 ( echo. echo -------------------------------------------------------------------------- -echo *** msbuild %MAKE_OPTIONS% /p:Configuration=Release ALL_BUILD.vcxproj +echo *** msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% ALL_BUILD.vcxproj echo -------------------------------------------------------------------------- msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 ALL_BUILD.vcxproj diff --git a/products/compil_scripts/openblas.bat b/products/compil_scripts/openblas.bat index c3d92e4..263052e 100644 --- a/products/compil_scripts/openblas.bat +++ b/products/compil_scripts/openblas.bat @@ -9,10 +9,12 @@ IF NOT DEFINED SAT_DEBUG ( ) SET PRODUCT_BUILD_TYPE=Release -REM TODO: NGH: not Tested yet -REM if %SAT_DEBUG% == 1 ( -REM set PRODUCT_BUILD_TYPE=Debug -REM ) +IF DEFINED SAT_CMAKE_BUILD_TYPE ( + SET PRODUCT_BUILD_TYPE=%SAT_CMAKE_BUILD_TYPE% +) +if %SAT_DEBUG% == 1 ( + set PRODUCT_BUILD_TYPE=Debug +) if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL% REM clean BUILD directory @@ -40,9 +42,9 @@ set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_Fortran_COMPILER=%MINGW_ROOT_DIR:\=/%/ set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_EXE_LINKER_FLAGS="-Wl,--allow-multiple-definition" set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_SH="CMAKE_SH-NOTFOUND" if defined CMAKE_GENERATOR ( - set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR% + set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64 ) else ( - set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR="MinGW Makefiles" + set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR="MinGW Makefiles" ) set MSBUILDDISABLENODEREUSE=1 @@ -55,13 +57,13 @@ if NOT %ERRORLEVEL% == 0 ( ) echo. echo ********************************************************************* -echo *** mingw32-make" +echo *** mingw32-make echo ********************************************************************* echo. mingw32-make if NOT %ERRORLEVEL% == 0 ( - echo ERROR on msbuild ALL_BUILD.vcxproj + echo ERROR on mingw exit 2 ) @@ -72,7 +74,7 @@ echo ********************************************************************* echo. mingw32-make install if NOT %ERRORLEVEL% == 0 ( - echo ERROR on msbuild INSTALL.vcxproj + echo ERROR on mingw exit 3 ) diff --git a/products/compil_scripts/opencv.bat b/products/compil_scripts/opencv.bat index 3680921..ad0256f 100755 --- a/products/compil_scripts/opencv.bat +++ b/products/compil_scripts/opencv.bat @@ -9,11 +9,13 @@ IF NOT DEFINED SAT_DEBUG ( ) IF NOT DEFINED CMAKE_GENERATOR ( - SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64" + SET CMAKE_GENERATOR="Visual Studio 15 2017" ) SET PRODUCT_BUILD_TYPE=Release -REM TODO: NGH: not Tested yet +IF DEFINED SAT_CMAKE_BUILD_TYPE ( + SET PRODUCT_BUILD_TYPE=%SAT_CMAKE_BUILD_TYPE% +) if %SAT_DEBUG% == 1 ( set PRODUCT_BUILD_TYPE=Debug ) @@ -38,7 +40,7 @@ if %SAT_DEBUG% == 0 ( SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBUILD_opencv_java:STRING=OFF REM OpenBLAS triggers a compilation issue / So stay as we were before the introduction of OpenBLAS SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DWITH_LAPACK:BOOL=OFF -SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR% +SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64 cd %BUILD_DIR% diff --git a/products/compil_scripts/openturns-1.20.1.bat b/products/compil_scripts/openturns-1.20.1.bat index 94ef02c..72bc06e 100644 --- a/products/compil_scripts/openturns-1.20.1.bat +++ b/products/compil_scripts/openturns-1.20.1.bat @@ -9,11 +9,12 @@ IF NOT DEFINED SAT_DEBUG ( ) IF NOT DEFINED CMAKE_GENERATOR ( - SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64" + SET CMAKE_GENERATOR="Visual Studio 15 2017" ) SET PRODUCT_BUILD_TYPE=Release - -REM TODO: NGH: not Tested yet +IF DEFINED SAT_CMAKE_BUILD_TYPE ( + SET PRODUCT_BUILD_TYPE=%SAT_CMAKE_BUILD_TYPE% +) if %SAT_DEBUG% == 1 ( set PRODUCT_BUILD_TYPE=Debug ) @@ -53,9 +54,9 @@ GOTO:MAIN echo. echo -------------------------------------------------------------------------- - echo *** %CMAKE_ROOT%\bin\cmake -G %CMAKE_GENERATOR% %MODULE_CMAKE_OPTIONS% %MODULE_SOURCE_DIR% + echo *** %CMAKE_ROOT%\bin\cmake -G %CMAKE_GENERATOR% -A x64 %MODULE_CMAKE_OPTIONS% %MODULE_SOURCE_DIR% echo -------------------------------------------------------------------------- - %CMAKE_ROOT%\bin\cmake -G %CMAKE_GENERATOR% %MODULE_CMAKE_OPTIONS% %MODULE_SOURCE_DIR% + %CMAKE_ROOT%\bin\cmake -G %CMAKE_GENERATOR% -A x64 %MODULE_CMAKE_OPTIONS% %MODULE_SOURCE_DIR% if NOT %ERRORLEVEL% == 0 ( echo ERROR on cmake exit 1 diff --git a/products/compil_scripts/openturns-1.21.bat b/products/compil_scripts/openturns-1.21.bat index b030b44..1bb192b 100644 --- a/products/compil_scripts/openturns-1.21.bat +++ b/products/compil_scripts/openturns-1.21.bat @@ -9,11 +9,12 @@ IF NOT DEFINED SAT_DEBUG ( ) IF NOT DEFINED CMAKE_GENERATOR ( - SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64" + SET CMAKE_GENERATOR="Visual Studio 15 2017" ) SET PRODUCT_BUILD_TYPE=Release - -REM TODO: NGH: not Tested yet +IF DEFINED SAT_CMAKE_BUILD_TYPE ( + SET PRODUCT_BUILD_TYPE=%SAT_CMAKE_BUILD_TYPE% +) if %SAT_DEBUG% == 1 ( set PRODUCT_BUILD_TYPE=Debug ) @@ -43,16 +44,15 @@ GOTO:MAIN REM NGH: We replace ' with " - we could of course parse the input. ECHO call MODULE_BUILDER for %MODULE_NAME% ECHO command line option: %MODULE_CMAKE_OPTIONS% - REM TODO: NGH: not Tested yet if exist "%MODULE_BUILD_DIR%" rmdir /Q /S %MODULE_BUILD_DIR% mkdir %MODULE_BUILD_DIR% cd %MODULE_BUILD_DIR% echo. echo -------------------------------------------------------------------------- - echo *** %CMAKE_ROOT%\bin\cmake -G %CMAKE_GENERATOR% %MODULE_CMAKE_OPTIONS% %MODULE_SOURCE_DIR% + echo *** %CMAKE_ROOT%\bin\cmake -G %CMAKE_GENERATOR% -A x64 %MODULE_CMAKE_OPTIONS% %MODULE_SOURCE_DIR% echo -------------------------------------------------------------------------- - %CMAKE_ROOT%\bin\cmake -G %CMAKE_GENERATOR% %MODULE_CMAKE_OPTIONS% %MODULE_SOURCE_DIR% + %CMAKE_ROOT%\bin\cmake -G %CMAKE_GENERATOR% -A x64 %MODULE_CMAKE_OPTIONS% %MODULE_SOURCE_DIR% if NOT %ERRORLEVEL% == 0 ( echo ERROR on cmake exit 1 diff --git a/products/compil_scripts/openturns-1.22.bat b/products/compil_scripts/openturns-1.22.bat index a84f383..9c1ffe3 100644 --- a/products/compil_scripts/openturns-1.22.bat +++ b/products/compil_scripts/openturns-1.22.bat @@ -9,11 +9,13 @@ IF NOT DEFINED SAT_DEBUG ( ) IF NOT DEFINED CMAKE_GENERATOR ( - SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64" + SET CMAKE_GENERATOR="Visual Studio 15 2017" ) -SET PRODUCT_BUILD_TYPE=Release -REM TODO: NGH: not Tested yet +SET PRODUCT_BUILD_TYPE=Release +IF DEFINED SAT_CMAKE_BUILD_TYPE ( + SET PRODUCT_BUILD_TYPE=%SAT_CMAKE_BUILD_TYPE% +) if %SAT_DEBUG% == 1 ( set PRODUCT_BUILD_TYPE=Debug ) @@ -43,16 +45,15 @@ GOTO:MAIN REM NGH: We replace ' with " - we could of course parse the input. ECHO call MODULE_BUILDER for %MODULE_NAME% ECHO command line option: %MODULE_CMAKE_OPTIONS% - REM TODO: NGH: not Tested yet if exist "%MODULE_BUILD_DIR%" rmdir /Q /S %MODULE_BUILD_DIR% mkdir %MODULE_BUILD_DIR% cd %MODULE_BUILD_DIR% echo. echo -------------------------------------------------------------------------- - echo *** %CMAKE_ROOT%\bin\cmake -G %CMAKE_GENERATOR% %MODULE_CMAKE_OPTIONS% %MODULE_SOURCE_DIR% + echo *** %CMAKE_ROOT%\bin\cmake -G %CMAKE_GENERATOR% -A x64 %MODULE_CMAKE_OPTIONS% %MODULE_SOURCE_DIR% echo -------------------------------------------------------------------------- - %CMAKE_ROOT%\bin\cmake -G %CMAKE_GENERATOR% %MODULE_CMAKE_OPTIONS% %MODULE_SOURCE_DIR% + %CMAKE_ROOT%\bin\cmake -G %CMAKE_GENERATOR% -A x64 %MODULE_CMAKE_OPTIONS% %MODULE_SOURCE_DIR% if NOT %ERRORLEVEL% == 0 ( echo ERROR on cmake exit 1 diff --git a/products/compil_scripts/planegcs.bat b/products/compil_scripts/planegcs.bat index 62319c2..1dcb4a8 100644 --- a/products/compil_scripts/planegcs.bat +++ b/products/compil_scripts/planegcs.bat @@ -9,14 +9,16 @@ IF NOT DEFINED SAT_DEBUG ( ) IF NOT DEFINED CMAKE_GENERATOR ( - SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64" + SET CMAKE_GENERATOR="Visual Studio 15 2017" ) SET PRODUCT_BUILD_TYPE=Release -REM TODO: NGH: not Tested yet -REM if %SAT_DEBUG% == 1 ( -REM set PRODUCT_BUILD_TYPE=Debug -REM ) +IF DEFINED SAT_CMAKE_BUILD_TYPE ( + SET PRODUCT_BUILD_TYPE=%SAT_CMAKE_BUILD_TYPE% +) +if %SAT_DEBUG% == 1 ( + set PRODUCT_BUILD_TYPE=Debug +) if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL% REM clean BUILD directory @@ -33,7 +35,7 @@ set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBOOST_ROOT:PATH=%BOOST_ROOT_DIR:\=/% set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBoost_ADDITIONAL_VERSIONS="%BOOST_VERSION% %BOOST_VERSION_MajorMinor%" set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBOOST_INCLUDEDIR=%Boost_INCLUDE_DIR:\=/% set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBoost_INCLUDE_DIR=%Boost_INCLUDE_DIR:\=/% -set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64 set MSBUILDDISABLENODEREUSE=1 diff --git a/products/compil_scripts/zlib-1.2.11.bat b/products/compil_scripts/zlib-1.2.11.bat index fae67e0..bd70d25 100644 --- a/products/compil_scripts/zlib-1.2.11.bat +++ b/products/compil_scripts/zlib-1.2.11.bat @@ -9,10 +9,14 @@ IF NOT DEFINED SAT_DEBUG ( ) IF NOT DEFINED CMAKE_GENERATOR ( - SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64" + SET CMAKE_GENERATOR="Visual Studio 15 2017" ) SET PRODUCT_BUILD_TYPE=Release +IF DEFINED SAT_CMAKE_BUILD_TYPE ( + SET PRODUCT_BUILD_TYPE=%SAT_CMAKE_BUILD_TYPE% +) + if %SAT_DEBUG% == 1 ( set PRODUCT_BUILD_TYPE=Debug ) diff --git a/products/compil_scripts/zlib-1.2.5.bat b/products/compil_scripts/zlib-1.2.5.bat index abe3583..f8e0f79 100644 --- a/products/compil_scripts/zlib-1.2.5.bat +++ b/products/compil_scripts/zlib-1.2.5.bat @@ -8,7 +8,15 @@ IF NOT DEFINED SAT_DEBUG ( SET SAT_DEBUG=0 ) +IF NOT DEFINED CMAKE_GENERATOR ( + SET CMAKE_GENERATOR="Visual Studio 15 2017" +) + SET PRODUCT_BUILD_TYPE=Release +IF DEFINED SAT_CMAKE_BUILD_TYPE ( + SET PRODUCT_BUILD_TYPE=%SAT_CMAKE_BUILD_TYPE% +) + if %SAT_DEBUG% == 1 ( set PRODUCT_BUILD_TYPE=Debug ) @@ -18,6 +26,11 @@ if "%SALOME_APPLICATION_NAME%" == "URANIE" ( set PLATFORM_TARGET=Win32 ) +set CMAKE_OPTIONS_EXTRA= -G %CMAKE_GENERATOR% -A x64 +if "%SALOME_APPLICATION_NAME%" == "URANIE" ( + set CMAKE_OPTIONS_EXTRA= -A Win32 -Thost=x64 -DCMAKE_SYSTEM_VERSION=10.0.19041.0 +) + if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL% REM remove zconf.h - one could also patch the CMakeLists.txt file... @@ -34,10 +47,7 @@ cd %BUILD_DIR% set CMAKE_OPTIONS= set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_PREFIX:STRING=%PRODUCT_INSTALL:\=/% set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE=%PRODUCT_BUILD_TYPE% -if %PLATFORM_TARGET% == Win32 ( - set CMAKE_OPTIONS=%CMAKE_OPTIONS% -A Win32 -Thost=x64 -DCMAKE_SYSTEM_VERSION=10.0.19041.0 -) -set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR:STRING=%CMAKE_GENERATOR% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% %CMAKE_OPTIONS_EXTRA% set MSBUILDDISABLENODEREUSE=1 diff --git a/products/gl2ps.pyconf b/products/gl2ps.pyconf index 6d1c0b1..9a83399 100755 --- a/products/gl2ps.pyconf +++ b/products/gl2ps.pyconf @@ -4,7 +4,7 @@ default : build_source : "cmake" # Add the '-DENABLE_GLUT=OFF' option with CMakeLists.txt patch # to disable link with GLUT library and suppress '-DGLUT_FOUND=OFF' option - cmake_options : "-DCMAKE_BUILD_TYPE=Release -DENABLE_PNG=ON -DENABLE_ZLIB=ON -DENABLE_GLUT=OFF" + cmake_options : "-DENABLE_PNG=ON -DENABLE_ZLIB=ON -DENABLE_GLUT=OFF" get_source : "archive" environ : { @@ -36,7 +36,7 @@ version_1_3_5 : { # Add the '-DENABLE_GLUT=OFF' option with CMakeLists.txt patch # to disable link with GLUT library - cmake_options : "-DCMAKE_BUILD_TYPE=Release -DENABLE_ZLIB=OFF -DENABLE_PNG=OFF -DENABLE_GLUT=OFF" + cmake_options : "-DENABLE_ZLIB=OFF -DENABLE_PNG=OFF -DENABLE_GLUT=OFF" archive_info: { archive_name : "gl2ps-1.3.5.tar.gz" @@ -48,7 +48,7 @@ version_1_3_8 : { # Add the '-DENABLE_GLUT=OFF' option with CMakeLists.txt patch # to disable link with GLUT library - cmake_options : "-DCMAKE_BUILD_TYPE=Release -DENABLE_ZLIB=OFF -DENABLE_PNG=OFF -DENABLE_GLUT=OFF" + cmake_options : "-DENABLE_ZLIB=OFF -DENABLE_PNG=OFF -DENABLE_GLUT=OFF" archive_info: { archive_name : "gl2ps-1.3.8.tar.gz" @@ -60,7 +60,7 @@ version_1_3_9p1 : { # Add the '-DENABLE_GLUT=OFF' option with CMakeLists.txt patch # to disable link with GLUT library and suppress '-DGLUT_FOUND=OFF' option - cmake_options : "-DCMAKE_BUILD_TYPE=Release -DENABLE_PNG=ON -DENABLE_ZLIB=ON -DENABLE_GLUT=OFF" + cmake_options : "-DENABLE_PNG=ON -DENABLE_ZLIB=ON -DENABLE_GLUT=OFF" archive_info: { archive_name : "gl2ps-1.3.9p1.tar.gz" @@ -72,7 +72,7 @@ version_1_4_0_4037312 : { # Add the '-DENABLE_GLUT=OFF' option with CMakeLists.txt patch # to disable link with GLUT library and suppress '-DGLUT_FOUND=OFF' option - cmake_options : "-DCMAKE_BUILD_TYPE=Release -DENABLE_PNG=ON -DENABLE_ZLIB=ON -DENABLE_GLUT=OFF" + cmake_options : "-DENABLE_PNG=ON -DENABLE_ZLIB=ON -DENABLE_GLUT=OFF" archive_info: { archive_name : "gl2ps-1.4.0_4037312.tar.gz" diff --git a/products/llvm.pyconf b/products/llvm.pyconf index ac250ef..d7a733c 100644 --- a/products/llvm.pyconf +++ b/products/llvm.pyconf @@ -2,7 +2,7 @@ default : { name : "llvm" build_source : "cmake" - cmake_options : "-DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$LLVM_ROOT_DIR -DLLVM_BUILD_LLVM_DYLIB=ON -DLLVM_ENABLE_RTTI=ON -DLLVM_INSTALL_UTILS=ON -DLLVM_TARGETS_TO_BUILD:STRING=X86 -DPYTHON_EXECUTABLE=${PYTHON_ROOT_DIR}/bin/python" + cmake_options : "-DLLVM_BUILD_LLVM_DYLIB=ON -DLLVM_ENABLE_RTTI=ON -DLLVM_INSTALL_UTILS=ON -DLLVM_TARGETS_TO_BUILD:STRING=X86 -DPYTHON_EXECUTABLE=${PYTHON_ROOT_DIR}/bin/python" get_source : "archive" system_info : { diff --git a/products/omniORB.pyconf b/products/omniORB.pyconf index 10cc1b3..1972618 100644 --- a/products/omniORB.pyconf +++ b/products/omniORB.pyconf @@ -25,6 +25,16 @@ version_4_2_3_win_dbg: patches: ['omniORB-4.2.3-windows-debug.patch'] } +version_4_2_3 : +{ + patches: [] +} + +version_4_2_3_win: +{ + patches: ['omniORB-4.2.3-windows-visual-2019.patch'] +} + version_4_2_5: { patches: ['omniORB-4.2.5.p1.patch'] diff --git a/products/patches/FIELDS-9.10.0-visual-2019.patch b/products/patches/FIELDS-9.10.0-visual-2019.patch new file mode 100755 index 0000000..dbc33f7 --- /dev/null +++ b/products/patches/FIELDS-9.10.0-visual-2019.patch @@ -0,0 +1,12 @@ +diff --git a/src/MEDCouplingCorba_Swig/CMakeLists.txt b/src/MEDCouplingCorba_Swig/CMakeLists.txt +index c189405f5..cf976dc06 100644 +--- a/src/MEDCouplingCorba_Swig/CMakeLists.txt ++++ b/src/MEDCouplingCorba_Swig/CMakeLists.txt +@@ -63,6 +63,7 @@ ENDIF() + SWIG_LINK_LIBRARIES(MEDCouplingCorba ${PYTHON_LIBRARIES} medcouplingcorba ${PLATFORM_LIBS}) + IF(WIN32) + SET_TARGET_PROPERTIES(_MEDCouplingCorba PROPERTIES DEBUG_OUTPUT_NAME _MEDCouplingCorba_d) ++ TARGET_COMPILE_OPTIONS(_MEDCouplingCorba PRIVATE /bigobj) + ENDIF(WIN32) + + INSTALL(TARGETS _MEDCouplingCorba DESTINATION ${SALOME_INSTALL_PYTHON}) diff --git a/products/patches/GEOM-9.10.0-visual-2019.patch b/products/patches/GEOM-9.10.0-visual-2019.patch new file mode 100644 index 0000000..c943782 --- /dev/null +++ b/products/patches/GEOM-9.10.0-visual-2019.patch @@ -0,0 +1,24 @@ +diff --git a/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx b/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx +index 4727a5c5d..f9cff2743 100644 +--- a/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx ++++ b/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx +@@ -21,14 +21,13 @@ + // + + #ifdef WIN32 +-// E.A. : On windows with python 2.6, there is a conflict +-// E.A. : between pymath.h and Standard_math.h which define +-// E.A. : some same symbols : acosh, asinh, ... +-#include +-#include ++ #include ++ #include ++ #include ++#else ++ #include + #endif + +-#include + #include + + #ifdef HAVE_FINITE diff --git a/products/patches/GUI-9.10.0-visual-2019.patch b/products/patches/GUI-9.10.0-visual-2019.patch new file mode 100755 index 0000000..e23ce2e --- /dev/null +++ b/products/patches/GUI-9.10.0-visual-2019.patch @@ -0,0 +1,130 @@ +diff --git a/src/LightApp/LightApp_Application.cxx b/src/LightApp/LightApp_Application.cxx +index 718efbd13..8ed49c997 100644 +--- a/src/LightApp/LightApp_Application.cxx ++++ b/src/LightApp/LightApp_Application.cxx +@@ -30,6 +30,7 @@ + // E.A. : some same symbols : acosh, asinh, ... + #include + #ifndef DISABLE_PYCONSOLE ++ #include + #include + #endif + #endif +diff --git a/src/Qtx/QtxRubberBand.cxx b/src/Qtx/QtxRubberBand.cxx +index 68908bd00..f078aa0c6 100644 +--- a/src/Qtx/QtxRubberBand.cxx ++++ b/src/Qtx/QtxRubberBand.cxx +@@ -29,9 +29,11 @@ + #include + #include + #include +- +-#include +- ++#if defined(_MSC_VER) && _MSC_VER >= 1920 ++ #include ++#else ++ #include ++#endif + /*! + \class QtxAbstractRubberBand + \brief Analog of class QRubberBand with possibility of creation non-rectangular contour for selection. +diff --git a/src/SALOME_PY/SalomePy.cxx b/src/SALOME_PY/SalomePy.cxx +index bcdd520f1..bb648866d 100644 +--- a/src/SALOME_PY/SalomePy.cxx ++++ b/src/SALOME_PY/SalomePy.cxx +@@ -25,11 +25,9 @@ + // Author : Paul RASCLE, EDF + // + #ifdef WIN32 +-// E.A. : On windows with python 2.6, there is a conflict +-// E.A. : between pymath.h and Standard_math.h which define +-// E.A. : some same symbols : acosh, asinh, ... +-#include +-#include ++ #include ++ #include ++ #include + #endif + + #include +diff --git a/src/SALOME_PYQT/SalomePyQt/SalomePyQt.cxx b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.cxx +index eea242463..f71ba517f 100644 +--- a/src/SALOME_PYQT/SalomePyQt/SalomePyQt.cxx ++++ b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.cxx +@@ -24,11 +24,9 @@ + // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com) + + #ifdef WIN32 +-// E.A. : On windows with python 2.6, there is a conflict +-// E.A. : between pymath.h and Standard_math.h which define +-// E.A. : some same symbols : acosh, asinh, ... +-#include +-#include ++ #include ++ #include ++ #include + #endif + + #include "SALOME_PYQT_ModuleLight.h" // this include must be first!!! +diff --git a/src/SUIT/SUIT_DataObjectKey.cxx b/src/SUIT/SUIT_DataObjectKey.cxx +index a68031b2b..5c53249cf 100644 +--- a/src/SUIT/SUIT_DataObjectKey.cxx ++++ b/src/SUIT/SUIT_DataObjectKey.cxx +@@ -25,10 +25,14 @@ + #include + + #ifndef WIN32 +-#include +-#define _typeinfo std::type_info ++ #include ++ #define _typeinfo std::type_info + #else +-#include ++ #if defined(_MSC_VER) && _MSC_VER >= 1920 ++ #include ++ #else ++ #include ++ #endif + #define _typeinfo type_info + #endif + +diff --git a/src/SUIT/SUIT_DataOwner.cxx b/src/SUIT/SUIT_DataOwner.cxx +index 31fa5f047..a0c643d99 100644 +--- a/src/SUIT/SUIT_DataOwner.cxx ++++ b/src/SUIT/SUIT_DataOwner.cxx +@@ -23,10 +23,14 @@ + #include "SUIT_DataOwner.h" + + #ifndef WIN32 +-#include +-#define _typeinfo std::type_info ++ #include ++ #define _typeinfo std::type_info + #else +-#include ++ #if defined(_MSC_VER) && _MSC_VER >= 1920 ++ #include ++ #else ++ #include ++ #endif + #define _typeinfo type_info + #endif + +diff --git a/src/SalomeApp/SalomeApp_Application.cxx b/src/SalomeApp/SalomeApp_Application.cxx +index 1e9492add..06ec03c08 100644 +--- a/src/SalomeApp/SalomeApp_Application.cxx ++++ b/src/SalomeApp/SalomeApp_Application.cxx +@@ -25,11 +25,9 @@ + // Author: Sergey LITONIN + + #ifdef WIN32 +- // E.A. : On windows with python 2.6, there is a conflict +- // E.A. : between pymath.h and Standard_math.h which define +- // E.A. : some same symbols : acosh, asinh, ... + #include + #ifndef DISABLE_PYCONSOLE ++ #include + #include + #endif + #endif diff --git a/products/patches/KERNEL-9.10.0-visual-2019.patch b/products/patches/KERNEL-9.10.0-visual-2019.patch new file mode 100755 index 0000000..342d3e9 --- /dev/null +++ b/products/patches/KERNEL-9.10.0-visual-2019.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 282f4219e..dc84fb297 100755 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -92,6 +92,9 @@ FIND_PACKAGE(SalomeBoost REQUIRED) + + # Optional prerequisites + # ====================== ++IF(WIN32 AND MSVC_VERSION AND MSVC_VERSION VERSION_GREATER_EQUAL 1920) ++ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAVE_STRUCT_TIMESPEC") ++ENDIF() + + IF(NOT SALOME_LIGHT_ONLY) + FIND_PACKAGE(SalomeOmniORB REQUIRED) diff --git a/products/patches/MEDCOUPLING-9.10.0-visual-2019.patch b/products/patches/MEDCOUPLING-9.10.0-visual-2019.patch new file mode 100755 index 0000000..fce1b13 --- /dev/null +++ b/products/patches/MEDCOUPLING-9.10.0-visual-2019.patch @@ -0,0 +1,13 @@ +diff --git a/src/MEDCoupling_Swig/CMakeLists.txt b/src/MEDCoupling_Swig/CMakeLists.txt +index 125dda07..cecb3ff9 100644 +--- a/src/MEDCoupling_Swig/CMakeLists.txt ++++ b/src/MEDCoupling_Swig/CMakeLists.txt +@@ -165,6 +165,8 @@ ENDIF(WIN32) + IF(WIN32) + SET_TARGET_PROPERTIES(_MEDCouplingRemapper PROPERTIES DEBUG_OUTPUT_NAME _MEDCouplingRemapper_d) + SET_TARGET_PROPERTIES(_${MEDCouling_target_name} PROPERTIES DEBUG_OUTPUT_NAME _${MEDCouling_target_name}_d) ++ TARGET_COMPILE_OPTIONS(_MEDCouplingRemapper PRIVATE /bigobj) ++ TARGET_COMPILE_OPTIONS(_${MEDCouling_target_name} PRIVATE /bigobj) + ENDIF(WIN32) + INSTALL(TARGETS ${SWIG_MODULE_${MEDCouling_target_name}_REAL_NAME} ${SWIG_MODULE_MEDCouplingRemapper_REAL_NAME} DESTINATION ${MEDCOUPLING_INSTALL_PYTHON}) + diff --git a/products/patches/SHAPER-9.10.0-visual-2019.patch b/products/patches/SHAPER-9.10.0-visual-2019.patch new file mode 100755 index 0000000..4747f0a --- /dev/null +++ b/products/patches/SHAPER-9.10.0-visual-2019.patch @@ -0,0 +1,69 @@ +diff --git a/src/Config/Config_PropManager.cpp b/src/Config/Config_PropManager.cpp +index ba5d65b34..c57654d3e 100644 +--- a/src/Config/Config_PropManager.cpp ++++ b/src/Config/Config_PropManager.cpp +@@ -18,7 +18,9 @@ + // + + #include "Config_PropManager.h" +- ++#if defined(WIN32) ++ #include ++#endif + bool Config_PropManager::autoColorStatus = false; + + std::vector stringToRGB(const std::string& theColor); +diff --git a/src/GeomAPI/GeomAPI_Shape.h b/src/GeomAPI/GeomAPI_Shape.h +index 2997fd602..a76d4c61f 100644 +--- a/src/GeomAPI/GeomAPI_Shape.h ++++ b/src/GeomAPI/GeomAPI_Shape.h +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include + + class GeomAPI_Pnt; + class GeomAPI_Vertex; +diff --git a/src/InitializationPlugin/InitializationPlugin_EvalListener.h b/src/InitializationPlugin/InitializationPlugin_EvalListener.h +index f9c160656..d01406b99 100644 +--- a/src/InitializationPlugin/InitializationPlugin_EvalListener.h ++++ b/src/InitializationPlugin/InitializationPlugin_EvalListener.h +@@ -22,7 +22,7 @@ + + #include + #include +- ++#include + class ModelAPI_Attribute; + class ModelAPI_Document; + class ModelAPI_Feature; +diff --git a/src/ModelAPI/ModelAPI_IReentrant.h b/src/ModelAPI/ModelAPI_IReentrant.h +index a71da9bbe..ae936c948 100644 +--- a/src/ModelAPI/ModelAPI_IReentrant.h ++++ b/src/ModelAPI/ModelAPI_IReentrant.h +@@ -22,9 +22,11 @@ + + #include "ModelAPI.h" + ++#include + #include + #include + ++ + class Events_Message; + + /** \class ModelAPI_IReentrant +diff --git a/src/ParametersPlugin/ParametersPlugin_EvalListener.h b/src/ParametersPlugin/ParametersPlugin_EvalListener.h +index ba1c4faca..e904e7cc4 100644 +--- a/src/ParametersPlugin/ParametersPlugin_EvalListener.h ++++ b/src/ParametersPlugin/ParametersPlugin_EvalListener.h +@@ -19,7 +19,7 @@ + + #ifndef SRC_PARAMETERSPLUGIN_EVALLISTENER_H_ + #define SRC_PARAMETERSPLUGIN_EVALLISTENER_H_ +- ++#include + #include + #include + diff --git a/products/patches/omniORB-4.2.3-windows-visual-2019.patch b/products/patches/omniORB-4.2.3-windows-visual-2019.patch new file mode 100644 index 0000000..396e446 --- /dev/null +++ b/products/patches/omniORB-4.2.3-windows-visual-2019.patch @@ -0,0 +1,19 @@ +--- omniORB-4.2.3_ref/include/omnithread/pthread_nt.h 2017-02-20 23:45:59.000000000 +0100 ++++ omniORB-4.2.3_dev/include/omnithread/pthread_nt.h 2024-04-30 15:42:19.247133200 +0200 +@@ -42,6 +42,7 @@ + extern "C" { + #endif + ++#ifndef HAVE_STRUCT_TIMESPEC + #ifndef _TIMERS_T_ + #define _TIMERS_T_ + typedef struct timespec { +@@ -49,7 +50,7 @@ + long tv_nsec; + } timespec_t; + #endif +- ++#endif // HAVE_STRUCT_TIMESPEC + typedef char* __pthreadLongString_t; + typedef void* __pthreadLongAddr_t; + typedef __pthreadLongAddr_t* __pthreadLongAddr_p; diff --git a/products/root.pyconf b/products/root.pyconf index e220908..9a05e81 100644 --- a/products/root.pyconf +++ b/products/root.pyconf @@ -34,6 +34,21 @@ default_win: patches : [] } +version_6_30_06: +{ + get_source : "archive" + archive_info : {archive_name : "root_v6.30.06.source.tar.gz"} + patches : [] +} + +version_6_30_06_win: +{ + build_source : "script" + compil_script : "root-6.30.bat" + depend : ['Python', 'Cython', 'numpy', 'gl2ps', 'freetype', 'freeimage'] + patches : [] +} + version_6_24_00: { get_source : "archive"