{
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'
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 :
{
{
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'
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 :
{
{
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'
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 :
{
{
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'
{
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'
{
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 :
{
{
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'
{
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 :
{
{
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'
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 :
{
{
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'
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 :
{
{
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'
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 :
{
{
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'
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 :
{
{
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'
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 :
{
{
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'
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 :
{
{
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'
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 :
{
{
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'
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 :
{
{
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'
{
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'
{
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'
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
{
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'
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
{
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'
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
{
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'
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 :
{
{
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'
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 :
{
{
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:
{
]
}
+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"
]
}
+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",
}
+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"
}
}
+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 :
{
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}"
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']
)
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
)
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
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
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
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 *********************************************************************
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
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
)
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
)
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:\=/%
)
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
)
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:\=/%
)
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
)
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:\=/%
)
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
)
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:\=/%
)
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
)
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%
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
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
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
)
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 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
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
)
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
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
)
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%
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
)
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%
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
)
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=
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.
)
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%
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.
)
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
)
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:\=/%
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.
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
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
)
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:\=/%
)
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
)
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%
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
)
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
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
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
)
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
)
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%
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%
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
)
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
)
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%
)
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
)
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 *********************************************************************
)
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
)
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%
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
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
)
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%
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
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
SET SAT_DEBUG=0\r
)\r
\r
+IF NOT DEFINED CMAKE_GENERATOR (\r
+ SET CMAKE_GENERATOR="Visual Studio 15 2017"\r
+)\r
+\r
SET PRODUCT_BUILD_TYPE=Release\r
+IF DEFINED SAT_CMAKE_BUILD_TYPE (\r
+ SET PRODUCT_BUILD_TYPE=%SAT_CMAKE_BUILD_TYPE%\r
+)\r
+\r
if %SAT_DEBUG% == 1 (\r
set PRODUCT_BUILD_TYPE=Debug\r
)\r
set PLATFORM_TARGET=Win32\r
)\r
\r
+set CMAKE_OPTIONS_EXTRA= -G %CMAKE_GENERATOR% -A x64\r
+if "%SALOME_APPLICATION_NAME%" == "URANIE" (\r
+ set CMAKE_OPTIONS_EXTRA= -A Win32 -Thost=x64 -DCMAKE_SYSTEM_VERSION=10.0.19041.0\r
+)\r
+\r
+\r
if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL%\r
\r
REM clean BUILD directory\r
set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE=%PRODUCT_BUILD_TYPE%\r
set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBUILD_SHARED_LIBS=ON\r
set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_DISABLE_FIND_PACKAGE_HarfBuzz=TRUE\r
-if %PLATFORM_TARGET% == Win32 (\r
- set CMAKE_OPTIONS=%CMAKE_OPTIONS% -A Win32 -Thost=x64 -DCMAKE_SYSTEM_VERSION=10.0.19041.0\r
-)\r
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR:STRING=%CMAKE_GENERATOR%\r
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% %CMAKE_OPTIONS_EXTRA%\r
\r
set MSBUILDDISABLENODEREUSE=1\r
\r
)
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
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
)
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
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.
)
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
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.
)
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 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.
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
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
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 (
)
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
)
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
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
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
)
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%
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
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
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
)\r
\r
IF NOT DEFINED CMAKE_GENERATOR (\r
- SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"\r
+ SET CMAKE_GENERATOR="Visual Studio 15 2017"\r
)\r
\r
SET PRODUCT_BUILD_TYPE=Release\r
+IF DEFINED SAT_CMAKE_BUILD_TYPE (\r
+ SET PRODUCT_BUILD_TYPE=%SAT_CMAKE_BUILD_TYPE%\r
+)\r
+\r
if %SAT_DEBUG% == 1 (\r
set PRODUCT_BUILD_TYPE=Debug\r
)\r
) else (\r
SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DHDF5_ENABLE_PARALLEL:BOOL=OFF\r
)\r
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%\r
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64\r
\r
set MSBUILDDISABLENODEREUSE=1\r
\r
)
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 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%
)
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
)
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%
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%
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
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.
)\r
\r
IF NOT DEFINED CMAKE_GENERATOR (\r
- SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"\r
+ SET CMAKE_GENERATOR="Visual Studio 15 2017"\r
)\r
\r
SET PRODUCT_BUILD_TYPE=Release\r
+IF DEFINED SAT_CMAKE_BUILD_TYPE (\r
+ SET PRODUCT_BUILD_TYPE=%SAT_CMAKE_BUILD_TYPE%\r
+)\r
+\r
if %SAT_DEBUG% == 1 (\r
set PRODUCT_BUILD_TYPE=Debug\r
)\r
SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DMEDFILE_USE_MPI:BOOL=OFF\r
)\r
\r
-SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%\r
+SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64\r
\r
cd %BUILD_DIR%\r
\r
)\r
\r
IF NOT DEFINED CMAKE_GENERATOR (\r
- SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"\r
+ SET CMAKE_GENERATOR="Visual Studio 15 2017"\r
)\r
\r
SET PRODUCT_BUILD_TYPE=Release\r
-REM TODO: NGH: not Tested yet\r
-REM if %SAT_DEBUG% == 1 (\r
-REM set PRODUCT_BUILD_TYPE=Debug\r
-REM )\r
+IF DEFINED SAT_CMAKE_BUILD_TYPE (\r
+ SET PRODUCT_BUILD_TYPE=%SAT_CMAKE_BUILD_TYPE%\r
+)\r
+\r
+if %SAT_DEBUG% == 1 (\r
+ set PRODUCT_BUILD_TYPE=Debug\r
+)\r
\r
REM ensure that the installation directory does exist\r
if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL%\r
mkdir %BUILD_DIR%\r
cd %BUILD_DIR%\r
\r
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%\r
set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE:STRING=%PRODUCT_BUILD_TYPE%\r
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64\r
\r
set MSBUILDDISABLENODEREUSE=1\r
\r
)
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
)
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.
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
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
)
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
)
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 --------------------------------------------------------------------------
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
)
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
)
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
)\r
\r
IF NOT DEFINED CMAKE_GENERATOR (\r
- SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"\r
+ SET CMAKE_GENERATOR="Visual Studio 15 2017"\r
)\r
\r
SET PRODUCT_BUILD_TYPE=Release\r
dos2unix -q %SOURCE_DIR%/libsrc/nglib/*\r
\r
set CMAKE_OPTIONS=-DCMAKE_INSTALL_PREFIX:STRING=%PRODUCT_INSTALL:\=/%\r
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%\r
-set MSBUILDDISABLENODEREUSE=1\r
-\r
set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DZLIB_ROOT_DIR=%ZLIB_DIR%\r
set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCASROOT=%CASROOT%\r
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64\r
+set MSBUILDDISABLENODEREUSE=1\r
\r
cd %BUILD_DIR%\r
\r
)
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 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%
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
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
)
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%
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
)
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%
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.
)
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
)
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%
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
)
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
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
)
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
)
echo.
mingw32-make install
if NOT %ERRORLEVEL% == 0 (
- echo ERROR on msbuild INSTALL.vcxproj
+ echo ERROR on mingw
exit 3
)
)\r
\r
IF NOT DEFINED CMAKE_GENERATOR (\r
- SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"\r
+ SET CMAKE_GENERATOR="Visual Studio 15 2017"\r
)\r
\r
SET PRODUCT_BUILD_TYPE=Release\r
-REM TODO: NGH: not Tested yet\r
+IF DEFINED SAT_CMAKE_BUILD_TYPE (\r
+ SET PRODUCT_BUILD_TYPE=%SAT_CMAKE_BUILD_TYPE%\r
+)\r
if %SAT_DEBUG% == 1 (\r
set PRODUCT_BUILD_TYPE=Debug\r
)\r
SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBUILD_opencv_java:STRING=OFF\r
REM OpenBLAS triggers a compilation issue / So stay as we were before the introduction of OpenBLAS\r
SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DWITH_LAPACK:BOOL=OFF\r
-SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%\r
+SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64\r
\r
cd %BUILD_DIR%\r
\r
)
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
)
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
)
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
)
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
)
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
)
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
)
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
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
)
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
)
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
)
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...
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
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 :
{
{
# 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"
{
# 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"
{
# 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"
{
# 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"
{
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 :
{
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']
--- /dev/null
+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})
--- /dev/null
+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 <Standard_math.hxx>
+-#include <pymath.h>
++ #include <Standard_math.hxx>
++ #include <Python.h>
++ #include <pymath.h>
++#else
++ #include <Python.h>
+ #endif
+
+-#include <Python.h>
+ #include <structmember.h>
+
+ #ifdef HAVE_FINITE
--- /dev/null
+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 <Standard_math.hxx>
+ #ifndef DISABLE_PYCONSOLE
++ #include <Python.h>
+ #include <pymath.h>
+ #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 <QPalette>
+ #include <QShowEvent>
+ #include <QVectorIterator>
+-
+-#include <math.h>
+-
++#if defined(_MSC_VER) && _MSC_VER >= 1920
++ #include <cmath>
++#else
++ #include <math.h>
++#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 <Standard_math.hxx>
+-#include <pymath.h>
++ #include <Standard_math.hxx>
++ #include <Python.h>
++ #include <pymath.h>
+ #endif
+
+ #include <Python.h>
+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 <Standard_math.hxx>
+-#include <pymath.h>
++ #include <Standard_math.hxx>
++ #include <Python.h>
++ #include <pymath.h>
+ #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 <string.h>
+
+ #ifndef WIN32
+-#include <typeinfo>
+-#define _typeinfo std::type_info
++ #include <typeinfo>
++ #define _typeinfo std::type_info
+ #else
+-#include <typeinfo.h>
++ #if defined(_MSC_VER) && _MSC_VER >= 1920
++ #include <typeinfo>
++ #else
++ #include <typeinfo.h>
++ #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 <typeinfo>
+-#define _typeinfo std::type_info
++ #include <typeinfo>
++ #define _typeinfo std::type_info
+ #else
+-#include <typeinfo.h>
++ #if defined(_MSC_VER) && _MSC_VER >= 1920
++ #include <typeinfo>
++ #else
++ #include <typeinfo.h>
++ #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 <Standard_math.hxx>
+ #ifndef DISABLE_PYCONSOLE
++ #include <Python.h>
+ #include <pymath.h>
+ #endif
+ #endif
--- /dev/null
+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)
--- /dev/null
+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})
+
--- /dev/null
+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 <locale.h>
++#endif
+ bool Config_PropManager::autoColorStatus = false;
+
+ std::vector<int> 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 <GeomAPI_Interface.h>
+ #include <memory>
+ #include <list>
++#include<string>
+
+ 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 <InitializationPlugin.h>
+ #include <Events_Loop.h>
+-
++#include <string>
+ 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 <string>
+ #include <vector>
+ #include <memory>
+
++
+ 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 <string>
+ #include <ParametersPlugin.h>
+ #include <Events_Loop.h>
+
--- /dev/null
+--- 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;
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"
