mirror of
https://git.salome-platform.org/gitpub/modules/geom.git
synced 2024-12-24 16:30:35 +05:00
get rid of pthread
This commit is contained in:
parent
9cbf811a77
commit
e6ee1b7f91
@ -31,8 +31,9 @@ if (DEFINED EMSCRIPTEN)
|
||||
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
|
||||
list(APPEND CMAKE_FIND_ROOT_PATH "/")
|
||||
message("Using Emscripten")
|
||||
add_compile_options("--use-port=boost_headers" "-pthread")
|
||||
add_link_options("-pthread")
|
||||
add_link_options("-sWASM_BIGINT=1")
|
||||
# add_compile_options("--use-port=boost_headers" "-pthread")
|
||||
# add_link_options("-pthread")
|
||||
else()
|
||||
message("Not using Emscripten")
|
||||
endif()
|
||||
@ -107,7 +108,7 @@ ELSE()
|
||||
FIND_PACKAGE(SalomeOmniORBPy REQUIRED)
|
||||
ENDIF()
|
||||
|
||||
FIND_PACKAGE(SalomePThread REQUIRED)
|
||||
# FIND_PACKAGE(SalomePThread REQUIRED)
|
||||
FIND_PACKAGE(SalomeBoost REQUIRED)
|
||||
FIND_PACKAGE(SalomeOmniORB REQUIRED)
|
||||
FIND_PACKAGE(SalomeLibXml2 REQUIRED)
|
||||
|
@ -23,7 +23,7 @@
|
||||
INCLUDE_DIRECTORIES(
|
||||
${OpenCASCADE_INCLUDE_DIR}
|
||||
${KERNEL_INCLUDE_DIRS}
|
||||
${PTHREAD_INCLUDE_DIR}
|
||||
# ${PTHREAD_INCLUDE_DIR}
|
||||
)
|
||||
|
||||
# additional preprocessor / compiler flags
|
||||
|
@ -22,7 +22,7 @@
|
||||
# additional include directories
|
||||
INCLUDE_DIRECTORIES(
|
||||
${OMNIORB_INCLUDE_DIR}
|
||||
${PTHREAD_INCLUDE_DIR}
|
||||
# ${PTHREAD_INCLUDE_DIR}
|
||||
${OpenCASCADE_INCLUDE_DIR}
|
||||
${KERNEL_INCLUDE_DIRS}
|
||||
${PROJECT_SOURCE_DIR}/src/GEOMImpl
|
||||
|
@ -23,7 +23,7 @@ INCLUDE(UseQtExt)
|
||||
|
||||
# additional include directories
|
||||
INCLUDE_DIRECTORIES(
|
||||
${PTHREAD_INCLUDE_DIR}
|
||||
# ${PTHREAD_INCLUDE_DIR}
|
||||
${OMNIORB_INCLUDE_DIR}
|
||||
${OpenCASCADE_INCLUDE_DIR}
|
||||
${KERNEL_INCLUDE_DIRS}
|
||||
|
@ -23,7 +23,7 @@ INCLUDE(UseQtExt)
|
||||
|
||||
# additional include directories
|
||||
INCLUDE_DIRECTORIES(
|
||||
${PTHREAD_INCLUDE_DIR}
|
||||
# ${PTHREAD_INCLUDE_DIR}
|
||||
${OMNIORB_INCLUDE_DIR}
|
||||
${OpenCASCADE_INCLUDE_DIR}
|
||||
${KERNEL_INCLUDE_DIRS}
|
||||
|
@ -23,7 +23,7 @@
|
||||
INCLUDE_DIRECTORIES(
|
||||
${OpenCASCADE_INCLUDE_DIR}
|
||||
${KERNEL_INCLUDE_DIRS}
|
||||
${PTHREAD_INCLUDE_DIR}
|
||||
# ${PTHREAD_INCLUDE_DIR}
|
||||
${CMAKE_CURRENT_SOURCE_DIR}
|
||||
)
|
||||
|
||||
|
@ -23,7 +23,7 @@ INCLUDE(UseQtExt)
|
||||
|
||||
# additional include directories
|
||||
INCLUDE_DIRECTORIES(
|
||||
${PTHREAD_INCLUDE_DIR}
|
||||
# ${PTHREAD_INCLUDE_DIR}
|
||||
${OMNIORB_INCLUDE_DIR}
|
||||
${OpenCASCADE_INCLUDE_DIR}
|
||||
${KERNEL_INCLUDE_DIRS}
|
||||
|
@ -23,7 +23,7 @@ INCLUDE(UseQtExt)
|
||||
|
||||
# additional include directories
|
||||
INCLUDE_DIRECTORIES(
|
||||
${PTHREAD_INCLUDE_DIR}
|
||||
# ${PTHREAD_INCLUDE_DIR}
|
||||
${OMNIORB_INCLUDE_DIR}
|
||||
${OpenCASCADE_INCLUDE_DIR}
|
||||
${KERNEL_INCLUDE_DIRS}
|
||||
|
@ -23,7 +23,7 @@ INCLUDE(UseQtExt)
|
||||
|
||||
# additional include directories
|
||||
INCLUDE_DIRECTORIES(
|
||||
${PTHREAD_INCLUDE_DIR}
|
||||
# ${PTHREAD_INCLUDE_DIR}
|
||||
${OMNIORB_INCLUDE_DIR}
|
||||
${OpenCASCADE_INCLUDE_DIR}
|
||||
${KERNEL_INCLUDE_DIRS}
|
||||
|
@ -25,7 +25,7 @@ ENDIF(SALOME_BUILD_GUI)
|
||||
|
||||
# additional include directories
|
||||
INCLUDE_DIRECTORIES(
|
||||
${PTHREAD_INCLUDE_DIR}
|
||||
# ${PTHREAD_INCLUDE_DIR}
|
||||
${OpenCASCADE_INCLUDE_DIR}
|
||||
${KERNEL_INCLUDE_DIRS}
|
||||
${GUI_INCLUDE_DIRS}
|
||||
|
@ -21,7 +21,7 @@
|
||||
|
||||
# additional include directories
|
||||
INCLUDE_DIRECTORIES(
|
||||
${PTHREAD_INCLUDE_DIR}
|
||||
# ${PTHREAD_INCLUDE_DIR}
|
||||
${OMNIORB_INCLUDE_DIR}
|
||||
${OpenCASCADE_INCLUDE_DIR}
|
||||
${KERNEL_INCLUDE_DIRS}
|
||||
|
@ -23,7 +23,7 @@ INCLUDE(UseQtExt)
|
||||
|
||||
# additional include directories
|
||||
INCLUDE_DIRECTORIES(
|
||||
${PTHREAD_INCLUDE_DIR}
|
||||
# ${PTHREAD_INCLUDE_DIR}
|
||||
${OPENCV_INCLUDE_DIR}
|
||||
${OMNIORB_INCLUDE_DIR}
|
||||
${OpenCASCADE_INCLUDE_DIR}
|
||||
|
@ -22,7 +22,7 @@
|
||||
# additional include directories
|
||||
INCLUDE_DIRECTORIES(
|
||||
${OpenCASCADE_INCLUDE_DIR}
|
||||
${PTHREAD_INCLUDE_DIR}
|
||||
# ${PTHREAD_INCLUDE_DIR}
|
||||
${KERNEL_INCLUDE_DIRS}
|
||||
${PROJECT_SOURCE_DIR}/src/SKETCHER
|
||||
${CMAKE_CURRENT_SOURCE_DIR}
|
||||
|
@ -23,7 +23,7 @@ INCLUDE(UseQtExt)
|
||||
|
||||
# additional include directories
|
||||
INCLUDE_DIRECTORIES(
|
||||
${PTHREAD_INCLUDE_DIR}
|
||||
# ${PTHREAD_INCLUDE_DIR}
|
||||
${OMNIORB_INCLUDE_DIR}
|
||||
${OpenCASCADE_INCLUDE_DIR}
|
||||
${KERNEL_INCLUDE_DIRS}
|
||||
|
@ -23,7 +23,7 @@
|
||||
INCLUDE_DIRECTORIES(
|
||||
${OMNIORB_INCLUDE_DIR}
|
||||
${OpenCASCADE_INCLUDE_DIR}
|
||||
${PTHREAD_INCLUDE_DIR}
|
||||
# ${PTHREAD_INCLUDE_DIR}
|
||||
${KERNEL_INCLUDE_DIRS}
|
||||
${PROJECT_BINARY_DIR}/idl
|
||||
${CMAKE_CURRENT_SOURCE_DIR}
|
||||
|
@ -22,7 +22,7 @@
|
||||
# additional include directories
|
||||
INCLUDE_DIRECTORIES(
|
||||
${OMNIORB_INCLUDE_DIR}
|
||||
${PTHREAD_INCLUDE_DIR}
|
||||
# ${PTHREAD_INCLUDE_DIR}
|
||||
${OpenCASCADE_INCLUDE_DIR}
|
||||
${KERNEL_INCLUDE_DIRS}
|
||||
${GUI_INCLUDE_DIRS}
|
||||
|
@ -23,7 +23,7 @@ INCLUDE(UseQtExt)
|
||||
|
||||
# additional include directories
|
||||
INCLUDE_DIRECTORIES(
|
||||
${PTHREAD_INCLUDE_DIR}
|
||||
# ${PTHREAD_INCLUDE_DIR}
|
||||
${OMNIORB_INCLUDE_DIR}
|
||||
${OpenCASCADE_INCLUDE_DIR}
|
||||
${KERNEL_INCLUDE_DIRS}
|
||||
|
@ -22,7 +22,7 @@
|
||||
# additional include directories
|
||||
INCLUDE_DIRECTORIES(
|
||||
${OpenCASCADE_INCLUDE_DIR}
|
||||
${PTHREAD_INCLUDE_DIR}
|
||||
# ${PTHREAD_INCLUDE_DIR}
|
||||
${KERNEL_INCLUDE_DIRS}
|
||||
${PYTHON_INCLUDE_DIRS}
|
||||
${PROJECT_SOURCE_DIR}/src/ShHealOper
|
||||
|
@ -23,7 +23,7 @@ INCLUDE(UseQtExt)
|
||||
|
||||
# additional include directories
|
||||
INCLUDE_DIRECTORIES(
|
||||
${PTHREAD_INCLUDE_DIR}
|
||||
# ${PTHREAD_INCLUDE_DIR}
|
||||
${OMNIORB_INCLUDE_DIR}
|
||||
${OpenCASCADE_INCLUDE_DIR}
|
||||
${KERNEL_INCLUDE_DIRS}
|
||||
|
@ -22,7 +22,7 @@
|
||||
# additional include directories
|
||||
INCLUDE_DIRECTORIES(
|
||||
${OpenCASCADE_INCLUDE_DIR}
|
||||
${PTHREAD_INCLUDE_DIR}
|
||||
# ${PTHREAD_INCLUDE_DIR}
|
||||
${LIBXML2_INCLUDE_DIR}
|
||||
${KERNEL_INCLUDE_DIRS}
|
||||
${CMAKE_CURRENT_SOURCE_DIR}
|
||||
|
@ -22,7 +22,7 @@
|
||||
# additional include directories
|
||||
INCLUDE_DIRECTORIES(
|
||||
${OMNIORB_INCLUDE_DIR}
|
||||
${PTHREAD_INCLUDE_DIR}
|
||||
# ${PTHREAD_INCLUDE_DIR}
|
||||
${OpenCASCADE_INCLUDE_DIR}
|
||||
${KERNEL_INCLUDE_DIRS}
|
||||
${PROJECT_SOURCE_DIR}/src/GEOMImpl
|
||||
|
@ -22,7 +22,7 @@
|
||||
# additional include directories
|
||||
INCLUDE_DIRECTORIES(
|
||||
${OMNIORB_INCLUDE_DIR}
|
||||
${PTHREAD_INCLUDE_DIR}
|
||||
# ${PTHREAD_INCLUDE_DIR}
|
||||
${KERNEL_INCLUDE_DIRS}
|
||||
${PROJECT_BINARY_DIR}/idl
|
||||
${CMAKE_CURRENT_SOURCE_DIR}
|
||||
|
@ -24,7 +24,7 @@ INCLUDE(${SWIG_USE_FILE})
|
||||
# additional include directories
|
||||
INCLUDE_DIRECTORIES(
|
||||
${QT_INCLUDE_DIRS}
|
||||
${PTHREAD_INCLUDE_DIR}
|
||||
#${PTHREAD_INCLUDE_DIR}
|
||||
${OMNIORB_INCLUDE_DIR}
|
||||
${OpenCASCADE_INCLUDE_DIR}
|
||||
${KERNEL_INCLUDE_DIRS}
|
||||
|
@ -23,7 +23,7 @@ INCLUDE(UseQtExt)
|
||||
|
||||
# additional include directories
|
||||
INCLUDE_DIRECTORIES(
|
||||
${PTHREAD_INCLUDE_DIR}
|
||||
# ${PTHREAD_INCLUDE_DIR}
|
||||
${OMNIORB_INCLUDE_DIR}
|
||||
${OpenCASCADE_INCLUDE_DIR}
|
||||
${KERNEL_INCLUDE_DIRS}
|
||||
|
@ -23,7 +23,7 @@ INCLUDE(UseQtExt)
|
||||
|
||||
# additional include directories
|
||||
INCLUDE_DIRECTORIES(
|
||||
${PTHREAD_INCLUDE_DIR}
|
||||
# ${PTHREAD_INCLUDE_DIR}
|
||||
${OMNIORB_INCLUDE_DIR}
|
||||
${OpenCASCADE_INCLUDE_DIR}
|
||||
${KERNEL_INCLUDE_DIRS}
|
||||
|
@ -23,7 +23,7 @@ INCLUDE(UseQtExt)
|
||||
|
||||
# additional include directories
|
||||
INCLUDE_DIRECTORIES(
|
||||
${PTHREAD_INCLUDE_DIR}
|
||||
# ${PTHREAD_INCLUDE_DIR}
|
||||
${OMNIORB_INCLUDE_DIR}
|
||||
${OpenCASCADE_INCLUDE_DIR}
|
||||
${KERNEL_INCLUDE_DIRS}
|
||||
|
@ -21,7 +21,7 @@
|
||||
|
||||
# additional include directories
|
||||
INCLUDE_DIRECTORIES(
|
||||
${PTHREAD_INCLUDE_DIR}
|
||||
# ${PTHREAD_INCLUDE_DIR}
|
||||
${OMNIORB_INCLUDE_DIR}
|
||||
${OpenCASCADE_INCLUDE_DIR}
|
||||
${KERNEL_INCLUDE_DIRS}
|
||||
|
@ -23,7 +23,7 @@ INCLUDE(UseQtExt)
|
||||
|
||||
# additional include directories
|
||||
INCLUDE_DIRECTORIES(
|
||||
${PTHREAD_INCLUDE_DIR}
|
||||
# ${PTHREAD_INCLUDE_DIR}
|
||||
${OMNIORB_INCLUDE_DIR}
|
||||
${OpenCASCADE_INCLUDE_DIR}
|
||||
${KERNEL_INCLUDE_DIRS}
|
||||
|
@ -23,7 +23,7 @@ INCLUDE(UseQtExt)
|
||||
|
||||
# additional include directories
|
||||
INCLUDE_DIRECTORIES(
|
||||
${PTHREAD_INCLUDE_DIR}
|
||||
# ${PTHREAD_INCLUDE_DIR}
|
||||
${OMNIORB_INCLUDE_DIR}
|
||||
${OpenCASCADE_INCLUDE_DIR}
|
||||
${KERNEL_INCLUDE_DIRS}
|
||||
|
@ -23,7 +23,7 @@ INCLUDE(UseQtExt)
|
||||
|
||||
# additional include directories
|
||||
INCLUDE_DIRECTORIES(
|
||||
${PTHREAD_INCLUDE_DIR}
|
||||
# ${PTHREAD_INCLUDE_DIR}
|
||||
${OMNIORB_INCLUDE_DIR}
|
||||
${OpenCASCADE_INCLUDE_DIR}
|
||||
${KERNEL_INCLUDE_DIRS}
|
||||
|
@ -23,7 +23,7 @@
|
||||
INCLUDE_DIRECTORIES(
|
||||
${OpenCASCADE_INCLUDE_DIR}
|
||||
${KERNEL_INCLUDE_DIRS}
|
||||
${PTHREAD_INCLUDE_DIR}
|
||||
# ${PTHREAD_INCLUDE_DIR}
|
||||
)
|
||||
|
||||
# additional preprocessor / compiler flags
|
||||
|
@ -23,7 +23,7 @@ INCLUDE(UseQtExt)
|
||||
|
||||
# additional include directories
|
||||
INCLUDE_DIRECTORIES(
|
||||
${PTHREAD_INCLUDE_DIR}
|
||||
# ${PTHREAD_INCLUDE_DIR}
|
||||
${OMNIORB_INCLUDE_DIR}
|
||||
${OpenCASCADE_INCLUDE_DIR}
|
||||
${KERNEL_INCLUDE_DIRS}
|
||||
|
@ -25,7 +25,7 @@ ENDIF(SALOME_BUILD_TESTS)
|
||||
|
||||
# additional include directories
|
||||
INCLUDE_DIRECTORIES(
|
||||
${PTHREAD_INCLUDE_DIR}
|
||||
# ${PTHREAD_INCLUDE_DIR}
|
||||
${LIBXML2_INCLUDE_DIR}
|
||||
${OpenCASCADE_INCLUDE_DIR}
|
||||
)
|
||||
@ -38,7 +38,7 @@ ADD_DEFINITIONS(
|
||||
|
||||
# libraries to link to
|
||||
SET(_link_LIBRARIES
|
||||
${PTHREAD_LIBRARIES}
|
||||
# ${PTHREAD_LIBRARIES}
|
||||
${LIBXML2_LIBRARIES}
|
||||
${OpenCASCADE_ModelingData_LIBRARIES}
|
||||
# ${OpenCASCADE_ModelingAlgorithms_LIBRARIES}
|
||||
|
@ -21,7 +21,7 @@ ADD_SUBDIRECTORY(data)
|
||||
|
||||
# additional include directories
|
||||
INCLUDE_DIRECTORIES(
|
||||
${PTHREAD_INCLUDE_DIR}
|
||||
# ${PTHREAD_INCLUDE_DIR}
|
||||
${OpenCASCADE_INCLUDE_DIR}
|
||||
${CPPUNIT_INCLUDE_DIRS}
|
||||
)
|
||||
|
@ -24,7 +24,7 @@ INCLUDE(${SWIG_USE_FILE})
|
||||
# additional include directories
|
||||
INCLUDE_DIRECTORIES(
|
||||
${PYTHON_INCLUDE_DIRS}
|
||||
${PTHREAD_INCLUDE_DIR}
|
||||
# ${PTHREAD_INCLUDE_DIR}
|
||||
${OpenCASCADE_INCLUDE_DIR}
|
||||
${PROJECT_SOURCE_DIR}/src/XAO
|
||||
)
|
||||
|
Loading…
Reference in New Issue
Block a user