OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-14 13:30:48 +03:00
Code Activity

0032629: Configuration, scripts - add USE_PTHREADS building option to wasm_build.bat

Browse Source
This commit is contained in:
kgv
2021-10-18 16:26:59 +03:00
committed by smoskvin
parent 7e63845c9e
commit 2c8c4b8086
7 changed files with 51 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/DRAWEXE/CMakeLists.txt
View File

@@ -62,7 +62,14 @@ if (EMSCRIPTEN)
# In case of WebAssembly build $tcl_library looks like "tcl8.6.11/library" by default.
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --preload-file ${3RDPARTY_TCL_LIBRARY_DIR}/tcl${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}@/tcl${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}.${TCL_RELEASE_SERIAL}/library")
install(FILES ${PROJECT_NAME}.html DESTINATION "${INSTALL_DIR_BIN}/${OCCT_INSTALL_BIN_LETTER}")
install(FILES ../DrawResources/lamp.ico DESTINATION "${INSTALL_DIR_BIN}/${OCCT_INSTALL_BIN_LETTER}")
install(FILES ${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bin\${OCCT_INSTALL_BIN_LETTER}/${PROJECT_NAME}.data DESTINATION "${INSTALL_DIR_BIN}/${OCCT_INSTALL_BIN_LETTER}")
install(FILES ${PROJECT_NAME}.html
DESTINATION "${INSTALL_DIR_BIN}/${OCCT_INSTALL_BIN_LETTER}")
install(FILES ../DrawResources/lamp.ico
DESTINATION "${INSTALL_DIR_BIN}/${OCCT_INSTALL_BIN_LETTER}")
install(FILES ${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bin\${OCCT_INSTALL_BIN_LETTER}/${PROJECT_NAME}.data
DESTINATION "${INSTALL_DIR_BIN}/${OCCT_INSTALL_BIN_LETTER}")
if (CMAKE_CXX_FLAGS MATCHES "-pthread")
install(FILES ${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bin\${OCCT_INSTALL_BIN_LETTER}/${PROJECT_NAME}.worker.js
DESTINATION "${INSTALL_DIR_BIN}/${OCCT_INSTALL_BIN_LETTER}")
endif()
endif()

2
src/OSD/OSD_Process.cxx
View File

@@ -41,7 +41,9 @@
#include <stdlib.h>
#include <sys/param.h>
#include <sys/time.h>
#if !defined(__EMSCRIPTEN__)
#include <pwd.h> // For command getpwuid
#endif
#include <unistd.h>
#endif

21
src/STEPConstruct/STEPConstruct_AP203Context.cxx
View File

@@ -60,8 +60,8 @@
#include <StepAP203_HArray1OfApprovedItem.hxx>
#include <StepBasic_ProductCategory.hxx>
#ifndef _WIN32
# include <pwd.h>
#if !defined(_WIN32) && !defined(__ANDROID__) && !defined(__EMSCRIPTEN__)
#include <pwd.h>
#endif
//=======================================================================
@@ -180,12 +180,19 @@ Handle(StepBasic_PersonAndOrganization) STEPConstruct_AP203Context::DefaultPerso
// construct person`s name
OSD_Process sys;
TCollection_AsciiString user (sys.UserName());
#if !defined(_WIN32) && !defined(__ANDROID__)
if ( !user.IsEmpty() ) {
struct passwd *pwd = getpwnam ( user.ToCString() );
if ( pwd ) user = pwd->pw_gecos;
#if !defined(_WIN32) && !defined(__ANDROID__) && !defined(__EMSCRIPTEN__)
if (!user.IsEmpty())
{
struct passwd* aPwd = getpwnam (user.ToCString());
if (aPwd != NULL)
{
user = aPwd->pw_gecos;
}
}
else
{
user = "Unknown";
}
else user = "Unknown";
#endif
Handle(TCollection_HAsciiString) fname = new TCollection_HAsciiString ("");
Handle(TCollection_HAsciiString) lname = new TCollection_HAsciiString ("");