ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-27 01:40:33 +05:00
Code Issues Packages Projects Releases Wiki Activity

First compilation fixes

Browse Source
This commit is contained in:
Louis Gombert 2024-08-09 11:26:53 +00:00
parent c8bd08f7fb
commit 1ead829f59
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -29,7 +29,7 @@ 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("--use-port=boost_headers" "-pthread") add_compile_options("-sUSE_BOOST_HEADERS=1" "-pthread")
add_link_options("-pthread") add_link_options("-pthread")
else() else()
message("Not using Emscripten") message("Not using Emscripten")
@ -119,7 +119,7 @@ FIND_PACKAGE(SalomePThread REQUIRED)
# SWIG # SWIG
FIND_PACKAGE(SalomeSWIG REQUIRED) FIND_PACKAGE(SalomeSWIG REQUIRED)
# Boost # Boost
FIND_PACKAGE(SalomeBoost REQUIRED) # FIND_PACKAGE(SalomeBoost REQUIRED)
# CORBA # CORBA
FIND_PACKAGE(SalomeOmniORB REQUIRED) FIND_PACKAGE(SalomeOmniORB REQUIRED)
FIND_PACKAGE(SalomeOmniORBPy REQUIRED) FIND_PACKAGE(SalomeOmniORBPy REQUIRED)
@ -338,7 +338,7 @@ SET(_${PROJECT_NAME}_exposed_targets
SMESHControls MeshDriver MeshDriverDAT MeshDriverGMF MeshDriverMED SMESHControls MeshDriver MeshDriverDAT MeshDriverGMF MeshDriverMED
MeshDriverSTL MeshDriverUNV MEDWrapper MeshDriverSTL MeshDriverUNV MEDWrapper
SMDS SMESHimpl SMESHEngine SMESHClient SMESHDS SMDS SMESHimpl SMESHEngine SMESHClient SMESHDS
SMESHUtils StdMeshers StdMeshersEngine MeshJobManagerEngine SMESHUtils StdMeshers StdMeshersEngine
SPADDERPluginTesterEngine SalomeIDLSMESH SalomeIDLSPADDER SPADDERPluginTesterEngine SalomeIDLSMESH SalomeIDLSPADDER
) )

6
src/SMDS/CMakeLists.txt
View File

@ -121,8 +121,8 @@ ADD_LIBRARY(SMDS ${SMDS_SOURCES})
TARGET_LINK_LIBRARIES(SMDS ${_link_LIBRARIES} ) TARGET_LINK_LIBRARIES(SMDS ${_link_LIBRARIES} )
INSTALL(TARGETS SMDS EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) INSTALL(TARGETS SMDS EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
ADD_EXECUTABLE(SMDS_MemoryLimit ${SMDS_MemoryLimit_SOURCES}) # ADD_EXECUTABLE(SMDS_MemoryLimit ${SMDS_MemoryLimit_SOURCES})
TARGET_LINK_LIBRARIES(SMDS_MemoryLimit ${_link_LIBRARIES}) # TARGET_LINK_LIBRARIES(SMDS_MemoryLimit ${_link_LIBRARIES})
INSTALL(TARGETS SMDS_MemoryLimit EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_BINS}) # INSTALL(TARGETS SMDS_MemoryLimit EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_BINS})
INSTALL(FILES ${SMDS_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) INSTALL(FILES ${SMDS_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})

2
src/SMESH/CMakeLists.txt
View File

@ -117,7 +117,7 @@ SET(SMESHimpl_SOURCES
SMESH_HypoFilter.cxx SMESH_HypoFilter.cxx
SMESH_ProxyMesh.cxx SMESH_ProxyMesh.cxx
SMESH_MesherHelper.cxx SMESH_MesherHelper.cxx
MG_ADAPT.cxx # MG_ADAPT.cxx
SMESH_Homard.cxx SMESH_Homard.cxx
SMESH_DriverMesh.cxx SMESH_DriverMesh.cxx
SMESH_DriverShape.cxx SMESH_DriverShape.cxx

2
src/SMESH_I/SMESH_Gen_i.cxx
View File

@ -50,7 +50,7 @@
#include <gp_Pnt.hxx> #include <gp_Pnt.hxx>
// Have to be included before std headers // Have to be included before std headers
#include <Python.h> // #include <Python.h>
#include <structmember.h> #include <structmember.h>
#ifdef WIN32 #ifdef WIN32

2
src/Tools/padder/meshjob/impl/CMakeLists.txt
View File

@ -34,7 +34,7 @@ INCLUDE_DIRECTORIES(
${PROJECT_SOURCE_DIR}/src/SMESHDS ${PROJECT_SOURCE_DIR}/src/SMESHDS
${PROJECT_SOURCE_DIR}/src/SMDS ${PROJECT_SOURCE_DIR}/src/SMDS
${PROJECT_SOURCE_DIR}/src/SMESHUtils ${PROJECT_SOURCE_DIR}/src/SMESHUtils
${PROJECT_BINARY_DIR}/src/Tools/padder/meshjob/idl # ${PROJECT_BINARY_DIR}/src/Tools/padder/meshjob/idl
${PROJECT_BINARY_DIR}/idl ${PROJECT_BINARY_DIR}/idl
) )