ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-01-14 10:40:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fix boost link issues

Browse Source
This commit is contained in:
Louis Gombert 2024-08-19 14:22:54 +00:00
parent 71d64ca6f8
commit 82e0e50732
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -29,8 +29,9 @@ STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
if (DEFINED EMSCRIPTEN) if (DEFINED EMSCRIPTEN)
list(APPEND CMAKE_FIND_ROOT_PATH "/") list(APPEND CMAKE_FIND_ROOT_PATH "/")
message("Using Emscripten") message("Using Emscripten")
add_compile_options("-sUSE_BOOST_HEADERS=1" "-pthread") add_compile_options(-sUSE_BOOST_HEADERS=1 -pthread)
add_link_options("-pthread") add_link_options(-sUSE_BOOST_HEADERS=1 -pthread)
add_compile_definitions(__EMSCRIPTEN__)
else() else()
message("Not using Emscripten") message("Not using Emscripten")
endif() endif()

2
src/SMESH_I/CMakeLists.txt
View File

@ -127,7 +127,7 @@ SET(SMESHEngine_SOURCES
SMESH_Gen_i_1.cxx SMESH_Gen_i_1.cxx
SMESH_Gen_No_Session_i.cxx SMESH_Gen_No_Session_i.cxx
SMESH_Gen_Session_i.cxx SMESH_Gen_Session_i.cxx
SMESH_PythonDump.cxx # SMESH_PythonDump.cxx # EMscripten: duplicate symbol
SMESH_Mesh_i.cxx SMESH_Mesh_i.cxx
SMESH_subMesh_i.cxx SMESH_subMesh_i.cxx
SMESH_MeshEditor_i.cxx SMESH_MeshEditor_i.cxx

10
src/SMESH_I/SMESH_Gen_i.cxx
View File

@ -153,9 +153,9 @@
#include <cstdlib> #include <cstdlib>
#include <memory> #include <memory>
#include <boost/archive/text_oarchive.hpp> // #include <boost/archive/text_oarchive.hpp>
#include <boost/serialization/list.hpp> // #include <boost/serialization/list.hpp>
#include <boost/serialization/string.hpp> // #include <boost/serialization/string.hpp>
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
namespace fs = boost::filesystem; namespace fs = boost::filesystem;
@ -4966,7 +4966,7 @@ SALOMEDS::TMPFile* SMESH_Gen_i::Save( SALOMEDS::SComponent_ptr theComponent,
} }
// convert orderEntryLists to string // convert orderEntryLists to string
std::ostringstream ostream; std::ostringstream ostream;
boost::archive::text_oarchive( ostream ) << orderEntryLists; // boost::archive::text_oarchive( ostream ) << orderEntryLists;
std::string orderEntryString = ostream.str(); std::string orderEntryString = ostream.str();
// write HDF group // write HDF group
@ -6153,7 +6153,7 @@ bool SMESH_Gen_i::Load( SALOMEDS::SComponent_ptr theComponent,
aDataset->CloseOnDisk(); aDataset->CloseOnDisk();
std::list< std::list< std::string > > orderEntryLists; std::list< std::list< std::string > > orderEntryLists;
SMESHUtils::BoostTxtArchive( dataString ) >> orderEntryLists; // SMESHUtils::BoostTxtArchive( dataString ) >> orderEntryLists;
TListOfListOfInt anOrderIds; TListOfListOfInt anOrderIds;
for ( const std::list< std::string >& entryList : orderEntryLists ) for ( const std::list< std::string >& entryList : orderEntryLists )