SALOME 9.1.0 Windows version

diff --git a/src/HEXABLOCK/HexAssoEdge.cxx b/src/HEXABLOCK/HexAssoEdge.cxx
index 345b6ad029d4232ed0074d00ec1a0ed245f72d7c..8f55ce2a68091b8d548db311562b807880b80917 100755 (executable)
--- a/src/HEXABLOCK/HexAssoEdge.cxx
+++ b/src/HEXABLOCK/HexAssoEdge.cxx
@@ -28,6 +28,8 @@
 
 #include <GCPnts_AbscissaPoint.hxx>
 
+#include <algorithm>
+
 BEGIN_NAMESPACE_HEXA
 
 // static bool db = on_debug ();

diff --git a/src/HEXABLOCK/HexDocument.hxx b/src/HEXABLOCK/HexDocument.hxx
index 23822cb4e6e4282d30a043a542cdb54ff8a8128a..afd9e0643f6e217c491c7562bb4d36e8efe2cdf7 100755 (executable)
--- a/src/HEXABLOCK/HexDocument.hxx
+++ b/src/HEXABLOCK/HexDocument.hxx
@@ -26,6 +26,8 @@
 #include "Hex_defines.hxx"
 #include "HexEltBase.hxx"
 
+#include <algorithm>
+
 #ifdef WIN32
  #ifdef max
   #undef max

diff --git a/src/HEXABLOCK/HexQpattern.cxx b/src/HEXABLOCK/HexQpattern.cxx
index e839ce9352793ba2abfa8e4319c23cac04f7c596..1f7147547ec357a491f558d1d778584a630066ef 100644 (file)
--- a/src/HEXABLOCK/HexQpattern.cxx
+++ b/src/HEXABLOCK/HexQpattern.cxx
@@ -31,6 +31,7 @@
 #include "HexGlobale.hxx"
 
 #include <cmath>
+#include <algorithm>
 #include <map>
 
 BEGIN_NAMESPACE_HEXA

diff --git a/src/HEXABLOCK/HexVertex.cxx b/src/HEXABLOCK/HexVertex.cxx
index 793bbcaf93326d0c48fd40ee19396ceea0b67d31..2a6c778471cb7436b6b0545f8d3a6aa2f72c2bda 100755 (executable)
--- a/src/HEXABLOCK/HexVertex.cxx
+++ b/src/HEXABLOCK/HexVertex.cxx
@@ -30,6 +30,8 @@
 #include "HexVertexShape.hxx"
 #include "HexKas_functions.hxx"
 
+#include <algorithm>
+
 BEGIN_NAMESPACE_HEXA
 
 static bool db =  on_debug ();  // == getenv ("HEXA_DB") > 0

diff --git a/src/HEXABLOCK/hexa_utils.cxx b/src/HEXABLOCK/hexa_utils.cxx
index 88d874663f01af0813f7c49eb564298613420be6..5fdffdaced9fd84c0cde2e04b00660babdc74240 100755 (executable)
--- a/src/HEXABLOCK/hexa_utils.cxx
+++ b/src/HEXABLOCK/hexa_utils.cxx
@@ -25,6 +25,7 @@
 #include <cstdlib>
 #include <cmath>
 #include <ctime>
+#include <algorithm>
 #include <sys/stat.h>
 
 BEGIN_NAMESPACE_HEXA

diff --git a/src/HEXABLOCK_SWIG/CMakeLists.txt b/src/HEXABLOCK_SWIG/CMakeLists.txt
index 7de0e2ce5e3971307048755d2e2d5dc1024bf9d7..543d283c6332b51ff8c5f9435210ed707152ab92 100644 (file)
--- a/src/HEXABLOCK_SWIG/CMakeLists.txt
+++ b/src/HEXABLOCK_SWIG/CMakeLists.txt
@@ -74,9 +74,14 @@ SET(_bin_SCRIPTS
 ADD_LIBRARY(hexablock_swig_lib ${_hexablock_swig_SOURCES})
 TARGET_LINK_LIBRARIES(hexablock_swig_lib ${_link_LIBRARIES} )
 
-add_library(_hexablock_swig MODULE ${_hexablock_swig_SOURCES})
-target_link_libraries(_hexablock_swig ${_link_LIBRARIES} ${hexablock_swig_lib}) # does nothing but reproduces previous SWIG_LINK_LIBRARIES line
-set_target_properties(_hexablock_swig PROPERTIES PREFIX "")
+IF(${CMAKE_VERSION} VERSION_LESS "3.8.0") 
+  SWIG_ADD_MODULE(hexablock_swig python hexablock_swig.i)
+ELSE()
+  SWIG_ADD_LIBRARY(hexablock_swig LANGUAGE python SOURCES hexablock_swig.i)
+ENDIF()
+
+
+SWIG_LINK_LIBRARIES(hexablock_swig ${_link_LIBRARIES} ${hexablock_swig_lib})
 INSTALL(TARGETS _hexablock_swig DESTINATION ${SALOME_INSTALL_LIBS})
 
 SALOME_INSTALL_SCRIPTS("${_bin_SCRIPTS}" ${SALOME_INSTALL_SCRIPT_PYTHON})