From 1ead829f5965aeed78a921d0e0e8227ba901f022 Mon Sep 17 00:00:00 2001 From: Louis Gombert Date: Fri, 9 Aug 2024 11:26:53 +0000 Subject: [PATCH] First compilation fixes --- CMakeLists.txt | 6 +++--- src/SMDS/CMakeLists.txt | 6 +++--- src/SMESH/CMakeLists.txt | 2 +- src/SMESH_I/SMESH_Gen_i.cxx | 2 +- src/Tools/padder/meshjob/impl/CMakeLists.txt | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 92815876d..0a31c2cf6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,7 +29,7 @@ STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC) if (DEFINED EMSCRIPTEN) list(APPEND CMAKE_FIND_ROOT_PATH "/") message("Using Emscripten") - add_compile_options("--use-port=boost_headers" "-pthread") + add_compile_options("-sUSE_BOOST_HEADERS=1" "-pthread") add_link_options("-pthread") else() message("Not using Emscripten") @@ -119,7 +119,7 @@ FIND_PACKAGE(SalomePThread REQUIRED) # SWIG FIND_PACKAGE(SalomeSWIG REQUIRED) # Boost -FIND_PACKAGE(SalomeBoost REQUIRED) +# FIND_PACKAGE(SalomeBoost REQUIRED) # CORBA FIND_PACKAGE(SalomeOmniORB REQUIRED) FIND_PACKAGE(SalomeOmniORBPy REQUIRED) @@ -338,7 +338,7 @@ SET(_${PROJECT_NAME}_exposed_targets SMESHControls MeshDriver MeshDriverDAT MeshDriverGMF MeshDriverMED MeshDriverSTL MeshDriverUNV MEDWrapper SMDS SMESHimpl SMESHEngine SMESHClient SMESHDS - SMESHUtils StdMeshers StdMeshersEngine MeshJobManagerEngine + SMESHUtils StdMeshers StdMeshersEngine SPADDERPluginTesterEngine SalomeIDLSMESH SalomeIDLSPADDER ) diff --git a/src/SMDS/CMakeLists.txt b/src/SMDS/CMakeLists.txt index 93ebd750e..3650ad5c9 100644 --- a/src/SMDS/CMakeLists.txt +++ b/src/SMDS/CMakeLists.txt @@ -121,8 +121,8 @@ ADD_LIBRARY(SMDS ${SMDS_SOURCES}) TARGET_LINK_LIBRARIES(SMDS ${_link_LIBRARIES} ) INSTALL(TARGETS SMDS EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) -ADD_EXECUTABLE(SMDS_MemoryLimit ${SMDS_MemoryLimit_SOURCES}) -TARGET_LINK_LIBRARIES(SMDS_MemoryLimit ${_link_LIBRARIES}) -INSTALL(TARGETS SMDS_MemoryLimit EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_BINS}) +# ADD_EXECUTABLE(SMDS_MemoryLimit ${SMDS_MemoryLimit_SOURCES}) +# TARGET_LINK_LIBRARIES(SMDS_MemoryLimit ${_link_LIBRARIES}) +# INSTALL(TARGETS SMDS_MemoryLimit EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_BINS}) INSTALL(FILES ${SMDS_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) diff --git a/src/SMESH/CMakeLists.txt b/src/SMESH/CMakeLists.txt index 540389b0c..684d11cc4 100644 --- a/src/SMESH/CMakeLists.txt +++ b/src/SMESH/CMakeLists.txt @@ -117,7 +117,7 @@ SET(SMESHimpl_SOURCES SMESH_HypoFilter.cxx SMESH_ProxyMesh.cxx SMESH_MesherHelper.cxx - MG_ADAPT.cxx + # MG_ADAPT.cxx SMESH_Homard.cxx SMESH_DriverMesh.cxx SMESH_DriverShape.cxx diff --git a/src/SMESH_I/SMESH_Gen_i.cxx b/src/SMESH_I/SMESH_Gen_i.cxx index 81dcf5a37..7eaf1035c 100644 --- a/src/SMESH_I/SMESH_Gen_i.cxx +++ b/src/SMESH_I/SMESH_Gen_i.cxx @@ -50,7 +50,7 @@ #include // Have to be included before std headers -#include +// #include #include #ifdef WIN32 diff --git a/src/Tools/padder/meshjob/impl/CMakeLists.txt b/src/Tools/padder/meshjob/impl/CMakeLists.txt index d970ad8a7..d0e59c780 100644 --- a/src/Tools/padder/meshjob/impl/CMakeLists.txt +++ b/src/Tools/padder/meshjob/impl/CMakeLists.txt @@ -34,7 +34,7 @@ INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/src/SMESHDS ${PROJECT_SOURCE_DIR}/src/SMDS ${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 )