]
}
+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}"
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_CXX_STANDARD=14
set CMAKE_OPTIONS=%CMAKE_OPTIONS% -Dbuiltin_fftw3=OFF
set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPYTHON_EXECUTABLE=%PYTHONBIN%
set CMAKE_OPTIONS=%CMAKE_OPTIONS% -Dbuiltin_zlib=OFF
set CMAKE_OPTIONS=%CMAKE_OPTIONS% -Dbuiltin_zstd=OFF
set CMAKE_OPTIONS=%CMAKE_OPTIONS% -Dmathmore=OFF
-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% -G %CMAKE_GENERATOR%
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -A x64
cd %BUILD_DIR%
SET INCLUDE=
echo.
echo --------------------------------------------------------------------------
-echo *** msbuild %MAKE_OPTIONS% /p:Configuration=Release /p:Platform=x86 ALL_BUILD.vcxproj
+echo *** msbuild %MAKE_OPTIONS% /p:Configuration=Release /p:Platform=x64 ALL_BUILD.vcxproj
echo --------------------------------------------------------------------------
-msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x86 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 --------------------------------------------------------------------------
-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
+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
version_3_2_0_win :
{
patches : ["opencv-3.2.0-ccache.patch",
- "opencv-3.2.0_windows.patch",
+ "opencv-3.2.0-msvc-version.patch",
"SPNS-29988-opencv-3.2.0-cv2.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
+--- opencv-3.2.0_ref/cmake/OpenCVDetectCXXCompiler.cmake 2019-07-16 15:47:28.000000000 +0200
++++ opencv-3.2.0_dev/cmake/OpenCVDetectCXXCompiler.cmake 2024-05-02 12:37:03.522774641 +0200
+@@ -162,6 +162,14 @@
+ set(OpenCV_RUNTIME vc14)
+ elseif(MSVC_VERSION EQUAL 1910)
+ set(OpenCV_RUNTIME vc15)
++ elseif(MSVC_VERSION EQUAL 1916)
++ set(OpenCV_RUNTIME vc15)
++ elseif(MSVC_VERSION VERSION_GREATER_EQUAL 1920 AND MSVC_VERSION LESS_EQUAL 1929 )
++ set(OpenCV_RUNTIME vc15) # done on purpose
++ elseif(MSVC_VERSION VERSION_GREATER_EQUAL 1930 AND MSVC_VERSION LESS_EQUAL 1939 )
++ set(OpenCV_RUNTIME vc15) # done on purpose
++ else()
++ MESSAGE(FATAL "MSVC_VERSION value ${MSVC_VERSION} not supported")
+ endif()
+ elseif(MINGW)
+ set(OpenCV_RUNTIME mingw)
+--- opencv-3.2.0_ref/cmake/templates/OpenCVConfig.root-WIN32.cmake.in 2019-07-16 15:47:28.000000000 +0200
++++ opencv-3.2.0_dev/cmake/templates/OpenCVConfig.root-WIN32.cmake.in 2024-05-02 12:36:11.747223041 +0200
+@@ -80,6 +80,14 @@
+ set(OpenCV_RUNTIME vc14)
+ elseif(MSVC_VERSION EQUAL 1910)
+ set(OpenCV_RUNTIME vc15)
++ elseif(MSVC_VERSION EQUAL 1916)
++ set(OpenCV_RUNTIME vc15)
++ elseif(MSVC_VERSION VERSION_GREATER_EQUAL 1920 AND MSVC_VERSION LESS_EQUAL 1929 )
++ set(OpenCV_RUNTIME vc15) # done on purpose
++ elseif(MSVC_VERSION VERSION_GREATER_EQUAL 1930 AND MSVC_VERSION LESS_EQUAL 1939 )
++ set(OpenCV_RUNTIME vc15) # done on purpose
++ else()
++ MESSAGE(FATAL "MSVC_VERSION value ${MSVC_VERSION} not supported")
+ endif()
+ elseif(MINGW)
+ set(OpenCV_RUNTIME mingw)
+@@ -115,6 +123,8 @@
+ else()
+ set(OpenCV_LIB_PATH "${OpenCV_CONFIG_PATH}/${OpenCV_ARCH}/${OpenCV_RUNTIME}/lib")
+ endif()
++ else(EXISTS "${OpenCV_CONFIG_PATH}/lib/OpenCVConfig.cmake")
++ set(OpenCV_LIB_PATH "${OpenCV_CONFIG_PATH}/lib")
+ endif()
+ endif()
+
patches : []
}
-version_6_24_00:
+version_6_24_06:
{
get_source : "archive"
patches : []
}
-version_6_24_00_win:
+version_6_24_06_win:
{
build_source : "script"
compil_script : "root-6.24.bat"
