Salome HOME
projects
/
modules
/
smesh.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
683b9e2
)
Compilation on Windows platform.
author
rnv
<rnv@opencascade.com>
Tue, 1 Apr 2014 09:28:48 +0000
(13:28 +0400)
committer
rnv
<rnv@opencascade.com>
Tue, 1 Apr 2014 09:28:48 +0000
(13:28 +0400)
src/DriverSTL/CMakeLists.txt
patch
|
blob
|
history
src/DriverSTL/DriverSTL_R_SMDS_Mesh.cxx
patch
|
blob
|
history
src/DriverSTL/DriverSTL_W_SMDS_Mesh.cxx
patch
|
blob
|
history
src/SMESHUtils/CMakeLists.txt
patch
|
blob
|
history
src/SMESHUtils/SMESH_File.cxx
patch
|
blob
|
history
diff --git
a/src/DriverSTL/CMakeLists.txt
b/src/DriverSTL/CMakeLists.txt
index 58c7147feec9ba2e457b84254e66ae85186cd87c..fa0a8139d86b8434572339ef019ea2892c7257f8 100644
(file)
--- a/
src/DriverSTL/CMakeLists.txt
+++ b/
src/DriverSTL/CMakeLists.txt
@@
-45,6
+45,7
@@
SET(_link_LIBRARIES
${KERNEL_SALOMEBasics}
MeshDriver
SMDS
${KERNEL_SALOMEBasics}
MeshDriver
SMDS
+ SMESHUtils
)
SET(_link_LIBRARIES_bin
)
SET(_link_LIBRARIES_bin
diff --git
a/src/DriverSTL/DriverSTL_R_SMDS_Mesh.cxx
b/src/DriverSTL/DriverSTL_R_SMDS_Mesh.cxx
index ee4da4a6f295ffa4cf7582e054b2d69bab977518..a250b428a9fe6099d4b1fee525b6dc354d6c690b 100644
(file)
--- a/
src/DriverSTL/DriverSTL_R_SMDS_Mesh.cxx
+++ b/
src/DriverSTL/DriverSTL_R_SMDS_Mesh.cxx
@@
-22,17
+22,17
@@
#include "DriverSTL_R_SMDS_Mesh.h"
#include "DriverSTL_R_SMDS_Mesh.h"
-#include "SMDS_Mesh.hxx"
-#include "SMDS_MeshElement.hxx"
-#include "SMDS_MeshNode.hxx"
-#include "SMESH_File.hxx"
-
-#include <gp_Pnt.hxx>
#include <Basics_Utils.hxx>
#include <Basics_Utils.hxx>
+#include <gp_Pnt.hxx>
#include <NCollection_DataMap.hxx>
#include <Standard_NoMoreObject.hxx>
#include <NCollection_DataMap.hxx>
#include <Standard_NoMoreObject.hxx>
+#include "SMDS_Mesh.hxx"
+#include "SMDS_MeshElement.hxx"
+#include "SMDS_MeshNode.hxx"
+#include "SMESH_File.hxx"
+
namespace
{
struct Hasher
namespace
{
struct Hasher
diff --git
a/src/DriverSTL/DriverSTL_W_SMDS_Mesh.cxx
b/src/DriverSTL/DriverSTL_W_SMDS_Mesh.cxx
index 5499183cb17440c3562d3873f4f9e19bee344133..2ac7ca5daee2945c5b70ba03bcc1544f87f37c4e 100644
(file)
--- a/
src/DriverSTL/DriverSTL_W_SMDS_Mesh.cxx
+++ b/
src/DriverSTL/DriverSTL_W_SMDS_Mesh.cxx
@@
-22,6
+22,12
@@
#include "DriverSTL_W_SMDS_Mesh.h"
#include "DriverSTL_W_SMDS_Mesh.h"
+#ifdef WIN32
+#define NOMINMAX
+#endif
+
+#include <Basics_Utils.hxx>
+
#include "SMDS_FaceOfNodes.hxx"
#include "SMDS_IteratorOnIterators.hxx"
#include "SMDS_Mesh.hxx"
#include "SMDS_FaceOfNodes.hxx"
#include "SMDS_IteratorOnIterators.hxx"
#include "SMDS_Mesh.hxx"
@@
-32,8
+38,6
@@
#include "SMESH_File.hxx"
#include "SMESH_TypeDefs.hxx"
#include "SMESH_File.hxx"
#include "SMESH_TypeDefs.hxx"
-#include <Basics_Utils.hxx>
-
//#include "utilities.h"
#include <limits>
//#include "utilities.h"
#include <limits>
diff --git
a/src/SMESHUtils/CMakeLists.txt
b/src/SMESHUtils/CMakeLists.txt
index 1281d9aca8b80517b0e4883e60c38dedd6d91520..5261c5d7fdebc35f3684644b26186d9f6a66e4df 100644
(file)
--- a/
src/SMESHUtils/CMakeLists.txt
+++ b/
src/SMESHUtils/CMakeLists.txt
@@
-42,6
+42,7
@@
SET(_link_LIBRARIES
${CAS_TKG3d}
${CAS_TKGeomBase}
${CAS_TKGeomAlgo}
${CAS_TKG3d}
${CAS_TKGeomBase}
${CAS_TKGeomAlgo}
+ ${Boost_LIBRARIES}
SMESHDS
)
SMESHDS
)
diff --git
a/src/SMESHUtils/SMESH_File.cxx
b/src/SMESHUtils/SMESH_File.cxx
index c31c2e8bc1e90cc2e9e5a26240907a4b6a826b97..d75cd108adc87461108262cbca7bdc22a3cc4c99 100644
(file)
--- a/
src/SMESHUtils/SMESH_File.cxx
+++ b/
src/SMESHUtils/SMESH_File.cxx
@@
-171,7
+171,7
@@
long SMESH_File::size()
if ( _size >= 0 ) return _size; // size of an open file
boost::system::error_code err;
if ( _size >= 0 ) return _size; // size of an open file
boost::system::error_code err;
- uintmax_t size = boofs::file_size( _name, err );
+
boost::
uintmax_t size = boofs::file_size( _name, err );
_error = err.message();
return err ? -1 : (long) size;
_error = err.message();
return err ? -1 : (long) size;