Skip to content

Commit

Permalink
Update to OCCT 7.8.1
Browse files Browse the repository at this point in the history
  • Loading branch information
mcristg committed Jul 24, 2024
1 parent e1ce26f commit 41dff26
Show file tree
Hide file tree
Showing 127 changed files with 6,405 additions and 5,911 deletions.
27 changes: 16 additions & 11 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -134,29 +134,34 @@ macro_optional_add_bindings(OpenCASCADE_FOUND "tkxml" tkxml)
macro_optional_add_bindings(OpenCASCADE_FOUND "tkxmltobj" tkxmltobj)
macro_optional_add_bindings(OpenCASCADE_FOUND "tkstd" tkstd)
macro_optional_add_bindings(OpenCASCADE_FOUND "tkexpress" tkexpress)
macro_optional_add_bindings(OpenCASCADE_FOUND "tkxde" tkxde)
macro_optional_add_bindings(OpenCASCADE_FOUND "tkde" tkde)
macro_optional_add_bindings(OpenCASCADE_FOUND "tkxsbase" tkxsbase)
macro_optional_add_bindings(OpenCASCADE_FOUND "tkstepbase" tkstepbase)
macro_optional_add_bindings(OpenCASCADE_FOUND "tkstepattr" tkstepattr)
macro_optional_add_bindings(OpenCASCADE_FOUND "tkstep209" tkstep209)
macro_optional_add_bindings(OpenCASCADE_FOUND "tkstep" tkstep)
macro_optional_add_bindings(OpenCASCADE_FOUND "tkiges" tkiges)
macro_optional_add_bindings(OpenCASCADE_FOUND "tkxcaf" tkxcaf)
macro_optional_add_bindings(OpenCASCADE_FOUND "tkxdeiges" tkxdeiges)
macro_optional_add_bindings(OpenCASCADE_FOUND "tkdeiges" tkdeiges)
macro_optional_add_bindings(OpenCASCADE_FOUND "tkrwmesh" tkrwmesh)
macro_optional_add_bindings(OpenCASCADE_FOUND "tkstl" tkstl)
macro_optional_add_bindings(OpenCASCADE_FOUND "tkdeply" tkdeply)
macro_optional_add_bindings(OpenCASCADE_FOUND "tkdegltf" tkdegltf)
macro_optional_add_bindings(OpenCASCADE_FOUND "tkdeobj" tkdeobj)
macro_optional_add_bindings(OpenCASCADE_FOUND "tkdestl" tkdestl)
macro_optional_add_bindings(OpenCASCADE_FOUND "tkxmlxcaf" tkxmlxcaf)
macro_optional_add_bindings(OpenCASCADE_FOUND "tkbinxcaf" tkbinxcaf)
macro_optional_add_bindings(OpenCASCADE_FOUND "tkvrml" tkvrml)
macro_optional_add_bindings(OpenCASCADE_FOUND "tkxdecascade" tkxdecascade)
macro_optional_add_bindings(OpenCASCADE_FOUND "tkxdestep" tkxdestep)
macro_optional_add_bindings(OpenCASCADE_FOUND "tkdevrml" tkdevrml)
macro_optional_add_bindings(OpenCASCADE_FOUND "tkdecascade" tkdecascade)
macro_optional_add_bindings(OpenCASCADE_FOUND "tkdestep" tkdestep)
macro_optional_add_bindings(OpenCASCADE_FOUND "tkdraw" tkdraw)
macro_optional_add_bindings(OpenCASCADE_FOUND "tktoptest" tktoptest)
macro_optional_add_bindings(OpenCASCADE_FOUND "tkviewertest" tkviewertest)
macro_optional_add_bindings(OpenCASCADE_FOUND "tkdcaf" tkdcaf)
macro_optional_add_bindings(OpenCASCADE_FOUND "tkopengltest" tkopengltest)
macro_optional_add_bindings(OpenCASCADE_FOUND "tktobjdraw" tktobjdraw)
macro_optional_add_bindings(OpenCASCADE_FOUND "tkxsdraw" tkxsdraw)
macro_optional_add_bindings(OpenCASCADE_FOUND "tkxsdrawgltf" tkxsdrawgltf)
macro_optional_add_bindings(OpenCASCADE_FOUND "tkxsdrawiges" tkxsdrawiges)
macro_optional_add_bindings(OpenCASCADE_FOUND "tkxsdrawobj" tkxsdrawobj)
macro_optional_add_bindings(OpenCASCADE_FOUND "tkxsdrawply" tkxsdrawply)
macro_optional_add_bindings(OpenCASCADE_FOUND "tkxsdrawstep" tkxsdrawstep)
macro_optional_add_bindings(OpenCASCADE_FOUND "tkxsdrawstl" tkxsdrawstl)
macro_optional_add_bindings(OpenCASCADE_FOUND "tkxsdrawvrml" tkxsdrawvrml)
macro_optional_add_bindings(OpenCASCADE_FOUND "tkxdedraw" tkxdedraw)
macro_optional_add_bindings(OpenCASCADE_FOUND "tkqadraw" tkqadraw)

Expand Down
5 changes: 0 additions & 5 deletions tkbo/smokeconfig.xml
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,8 @@
<class>BOPDS_Iterator</class>
<class>BOPDS_IteratorSI</class>
<class>BOPDS_Pair</class>
<class>BOPDS_PairMapHasher</class>
<class>BOPDS_Pave</class>
<class>BOPDS_PaveBlock</class>
<class>BOPDS_PaveMapHasher</class>
<class>BOPDS_Point</class>
<class>BOPDS_ShapeInfo</class>
<class>BOPDS_SubIterator</class>
Expand All @@ -101,7 +99,6 @@
<class>BOPTools_PairSelector</class>
<class>BOPTools_Parallel</class>
<class>BOPTools_Set</class>
<class>BOPTools_SetMapHasher</class>
<class>BRepAlgoAPI_Algo</class>
<class>BRepAlgoAPI_BooleanOperation</class>
<class>BRepAlgoAPI_BuilderAlgo</class>
Expand All @@ -120,7 +117,6 @@
<class>IntTools_Curve</class>
<class>IntTools_CurveRangeLocalizeData</class>
<class>IntTools_CurveRangeSample</class>
<class>IntTools_CurveRangeSampleMapHasher</class>
<class>IntTools_EdgeEdge</class>
<class>IntTools_EdgeFace</class>
<class>IntTools_FaceFace</class>
Expand All @@ -133,7 +129,6 @@
<class>IntTools_ShrunkRange</class>
<class>IntTools_SurfaceRangeLocalizeData</class>
<class>IntTools_SurfaceRangeSample</class>
<class>IntTools_SurfaceRangeSampleMapHasher</class>
<class>IntTools_Tools</class>
<class>IntTools_Tools</class>
<class>IntTools_TopolTool</class>
Expand Down
5 changes: 0 additions & 5 deletions tkbo/tkbo_includes.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,8 @@
#include <BOPDS_Iterator.hxx>
#include <BOPDS_IteratorSI.hxx>
#include <BOPDS_Pair.hxx>
#include <BOPDS_PairMapHasher.hxx>
#include <BOPDS_Pave.hxx>
#include <BOPDS_PaveBlock.hxx>
#include <BOPDS_PaveMapHasher.hxx>
#include <BOPDS_Point.hxx>
#include <BOPDS_ShapeInfo.hxx>
#include <BOPDS_SubIterator.hxx>
Expand All @@ -51,7 +49,6 @@
#include <BOPTools_PairSelector.hxx>
#include <BOPTools_Parallel.hxx>
#include <BOPTools_Set.hxx>
#include <BOPTools_SetMapHasher.hxx>
#include <BRepAlgoAPI_Algo.hxx>
#include <BRepAlgoAPI_BooleanOperation.hxx>
#include <BRepAlgoAPI_BuilderAlgo.hxx>
Expand All @@ -70,7 +67,6 @@
#include <IntTools_Curve.hxx>
#include <IntTools_CurveRangeLocalizeData.hxx>
#include <IntTools_CurveRangeSample.hxx>
#include <IntTools_CurveRangeSampleMapHasher.hxx>
#include <IntTools_EdgeEdge.hxx>
#include <IntTools_EdgeFace.hxx>
#include <IntTools_FaceFace.hxx>
Expand All @@ -83,7 +79,6 @@
#include <IntTools_ShrunkRange.hxx>
#include <IntTools_SurfaceRangeLocalizeData.hxx>
#include <IntTools_SurfaceRangeSample.hxx>
#include <IntTools_SurfaceRangeSampleMapHasher.hxx>
#include <IntTools_Tools.hxx>
#include <IntTools_TopolTool.hxx>
#include <IntTools_WLineTool.hxx>
Expand Down
1 change: 0 additions & 1 deletion tkbrep/smokeconfig.xml
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,6 @@
<class>NCollection_List&lt;TopoDS_Shape&gt;</class>
<class>TopTools_LocationSet</class>
<class>TopTools_MutexForShapeProvider</class>
<class>TopTools_OrientedShapeMapHasher</class>
<class>TopTools_ShapeMapHasher</class>
<class>TopTools_ShapeSet</class>
<class>TopoDS</class>
Expand Down
2 changes: 0 additions & 2 deletions tkbrep/tkbrep_includes.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

#include <BRep_Builder.hxx>
#include <BRep_Curve3D.hxx>
#include <BRep_CurveOn2Surfaces.hxx>
Expand Down Expand Up @@ -60,7 +59,6 @@
#include <TopTools_ListOfShape.hxx>
#include <TopTools_LocationSet.hxx>
#include <TopTools_MutexForShapeProvider.hxx>
#include <TopTools_OrientedShapeMapHasher.hxx>
#include <TopTools_ShapeMapHasher.hxx>
#include <TopTools_ShapeSet.hxx>
#include <TopoDS.hxx>
Expand Down
22 changes: 11 additions & 11 deletions tkxde/CMakeLists.txt → tkde/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,45 +1,45 @@
create_configure_files("${OpenCASCADE_INCLUDE_DIR};${CMAKE_CURRENT_SOURCE_DIR}")
get_smokegen_args(smokegenArgs tkxde)
get_smokegen_args(smokegenArgs tkde)
run_smokegen(1 "${smokegenArgs}")
get_smokegen_output_files(smoketkxde_LIB_SRCS 1)
get_smokegen_output_files(smoketkde_LIB_SRCS 1)

set(CMAKE_CXX_FLAGS "-I${OpenCASCADE_INCLUDE_DIR} -I${CMAKE_CURRENT_SOURCE_DIR}")

IF(CMAKE_CXX_FLAGS MATCHES "-fvisibility")
ADD_DEFINITIONS(-DGCC_VISIBILITY)
ENDIF(CMAKE_CXX_FLAGS MATCHES "-fvisibility")

add_library(smoketkxde SHARED ${smoketkxde_LIB_SRCS})
add_library(smoketkde SHARED ${smoketkde_LIB_SRCS})

link_directories(${OpenCASCADE_LIBRARY_DIR})

target_link_libraries(smoketkxde
target_link_libraries(smoketkde
smoketkernel
${OpenCASCADE_LIBRARIES}
)

set_target_properties(smoketkxde
set_target_properties(smoketkde
PROPERTIES
VERSION ${OpenCASCADE_MAJOR_VERSION}.${OpenCASCADE_MINOR_VERSION}.${OpenCASCADE_MAINTENANCE_VERSION}
SOVERSION ${OpenCASCADE_MAJOR_VERSION}
CXX_STANDARD 14
)

install(TARGETS smoketkxde LIBRARY DESTINATION ${LIB_INSTALL_DIR}
install(TARGETS smoketkde LIBRARY DESTINATION ${LIB_INSTALL_DIR}
ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
RUNTIME DESTINATION bin)

if (WIN32)
# Realign the stack, for compatibility with an older ABI.
if (CMAKE_COMPILER_IS_GNUCXX)
set_target_properties(smoketkxde PROPERTIES COMPILE_FLAGS -mstackrealign)
set_target_properties(smoketkde PROPERTIES COMPILE_FLAGS -mstackrealign)
endif()

# Get rid of the "lib" prefix on archives/DLLs in Windows.
set_target_properties(smoketkxde PROPERTIES PREFIX "" IMPORT_PREFIX "")
set_target_properties(smoketkde PROPERTIES PREFIX "" IMPORT_PREFIX "")
endif (WIN32)

install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../tkxde_smoke.h DESTINATION include/smoke)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/tkxde.argnames.txt DESTINATION share/smoke)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/tkxde.typedefs.txt DESTINATION share/smoke)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../tkde_smoke.h DESTINATION include/smoke)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/tkde.argnames.txt DESTINATION share/smoke)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/tkde.typedefs.txt DESTINATION share/smoke)

File renamed without changes.
3 changes: 2 additions & 1 deletion tkxde/smokeconfig.xml → tkde/smokeconfig.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<config>
<moduleName>tkxde</moduleName>
<moduleName>tkde</moduleName>
<parentModules>
<module>tkernel</module>
</parentModules>
Expand All @@ -22,6 +22,7 @@
<signature>.*qt_mac_set_cursor.*</signature>
</exclude>
<classList>
<class>DE_ConfigurationContext</class>
<class>DE_ConfigurationNode</class>
<class>DE_Provider</class>
<class>DE_Wrapper</class>
Expand Down
1 change: 1 addition & 0 deletions tkxde/tkxde_includes.h → tkde/tkde_includes.h
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include <DE_ConfigurationContext.hxx>
#include <DE_ConfigurationNode.hxx>
#include <DE_Provider.hxx>
#include <DE_Wrapper.hxx>
Expand Down
10 changes: 5 additions & 5 deletions tkxde_smoke.h → tkde_smoke.h
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#ifndef TKXDE_SMOKE_H
#define TKXDE_SMOKE_H
#ifndef TKDE_SMOKE_H
#define TKDE_SMOKE_H

#include <smoke.h>

// Defined in smokedata.cpp, initialized by init_tkxde_Smoke(), used by all .cpp files
extern "C" SMOKE_EXPORT Smoke* tkxde_Smoke;
extern "C" SMOKE_EXPORT void init_tkxde_Smoke();
extern "C" SMOKE_EXPORT void delete_tkxde_Smoke();
extern "C" SMOKE_EXPORT Smoke* tkde_Smoke;
extern "C" SMOKE_EXPORT void init_tkde_Smoke();
extern "C" SMOKE_EXPORT void delete_tkde_Smoke();

#ifndef QGLOBALSPACE_CLASS
#define QGLOBALSPACE_CLASS
Expand Down
47 changes: 47 additions & 0 deletions tkdecascade/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
create_configure_files("${OpenCASCADE_INCLUDE_DIR};${CMAKE_CURRENT_SOURCE_DIR}")
get_smokegen_args(smokegenArgs tkdecascade)
run_smokegen(1 "${smokegenArgs}")
get_smokegen_output_files(smoketkdecascade_LIB_SRCS 1)

set(CMAKE_CXX_FLAGS "-I${OpenCASCADE_INCLUDE_DIR} -I${CMAKE_CURRENT_SOURCE_DIR}")

IF(CMAKE_CXX_FLAGS MATCHES "-fvisibility")
ADD_DEFINITIONS(-DGCC_VISIBILITY)
ENDIF(CMAKE_CXX_FLAGS MATCHES "-fvisibility")

add_library(smoketkdecascade SHARED ${smoketkdecascade_LIB_SRCS})

link_directories(${OpenCASCADE_LIBRARY_DIR})

target_link_libraries(smoketkdecascade
smoketkde
smoketkxmlxcaf
smoketkbinxcaf
${OpenCASCADE_LIBRARIES}
)

set_target_properties(smoketkdecascade
PROPERTIES
VERSION ${OpenCASCADE_MAJOR_VERSION}.${OpenCASCADE_MINOR_VERSION}.${OpenCASCADE_MAINTENANCE_VERSION}
SOVERSION ${OpenCASCADE_MAJOR_VERSION}
CXX_STANDARD 14
)

install(TARGETS smoketkdecascade LIBRARY DESTINATION ${LIB_INSTALL_DIR}
ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
RUNTIME DESTINATION bin)

if (WIN32)
# Realign the stack, for compatibility with an older ABI.
if (CMAKE_COMPILER_IS_GNUCXX)
set_target_properties(smoketkdecascade PROPERTIES COMPILE_FLAGS -mstackrealign)
endif()

# Get rid of the "lib" prefix on archives/DLLs in Windows.
set_target_properties(smoketkdecascade PROPERTIES PREFIX "" IMPORT_PREFIX "")
endif (WIN32)

install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../tkdecascade_smoke.h DESTINATION include/smoke)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/tkdecascade.argnames.txt DESTINATION share/smoke)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/tkdecascade.typedefs.txt DESTINATION share/smoke)

File renamed without changes.
4 changes: 2 additions & 2 deletions tkxdecascade/smokeconfig.xml → tkdecascade/smokeconfig.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<config>
<moduleName>tkxdecascade</moduleName>
<moduleName>tkdecascade</moduleName>
<parentModules>
<module>tkxde</module>
<module>tkde</module>
<module>tkxmlxcaf</module>
<module>tkbinxcaf</module>
</parentModules>
Expand Down
File renamed without changes.
16 changes: 16 additions & 0 deletions tkdecascade_smoke.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#ifndef TKDECASCADE_SMOKE_H
#define TKDECASCADE_SMOKE_H

#include <smoke.h>

// Defined in smokedata.cpp, initialized by init_tkxdecascade_Smoke(), used by all .cpp files
extern "C" SMOKE_EXPORT Smoke* tkdecascade_Smoke;
extern "C" SMOKE_EXPORT void init_tkdecascade_Smoke();
extern "C" SMOKE_EXPORT void delete_tkdecascade_Smoke();

#ifndef QGLOBALSPACE_CLASS
#define QGLOBALSPACE_CLASS
class QGlobalSpace { };
#endif

#endif
24 changes: 12 additions & 12 deletions tkstep209/CMakeLists.txt → tkdegltf/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,45 +1,45 @@
create_configure_files("${OpenCASCADE_INCLUDE_DIR};${CMAKE_CURRENT_SOURCE_DIR}")
get_smokegen_args(smokegenArgs tkstep209)
get_smokegen_args(smokegenArgs tkdegltf)
run_smokegen(1 "${smokegenArgs}")
get_smokegen_output_files(smoketkstep209_LIB_SRCS 1)
get_smokegen_output_files(smoketkdegltf_LIB_SRCS 1)

set(CMAKE_CXX_FLAGS "-I${OpenCASCADE_INCLUDE_DIR} -I${CMAKE_CURRENT_SOURCE_DIR}")

IF(CMAKE_CXX_FLAGS MATCHES "-fvisibility")
ADD_DEFINITIONS(-DGCC_VISIBILITY)
ENDIF(CMAKE_CXX_FLAGS MATCHES "-fvisibility")

add_library(smoketkstep209 SHARED ${smoketkstep209_LIB_SRCS})
add_library(smoketkdegltf SHARED ${smoketkdegltf_LIB_SRCS})

link_directories(${OpenCASCADE_LIBRARY_DIR})

target_link_libraries(smoketkstep209
smoketkstepbase
target_link_libraries(smoketkdegltf
smoketkrwmesh
${OpenCASCADE_LIBRARIES}
)

set_target_properties(smoketkstep209
set_target_properties(smoketkdegltf
PROPERTIES
VERSION ${OpenCASCADE_MAJOR_VERSION}.${OpenCASCADE_MINOR_VERSION}.${OpenCASCADE_MAINTENANCE_VERSION}
SOVERSION ${OpenCASCADE_MAJOR_VERSION}
CXX_STANDARD 14
)

install(TARGETS smoketkstep209 LIBRARY DESTINATION ${LIB_INSTALL_DIR}
install(TARGETS smoketkdegltf LIBRARY DESTINATION ${LIB_INSTALL_DIR}
ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
RUNTIME DESTINATION bin)

if (WIN32)
# Realign the stack, for compatibility with an older ABI.
if (CMAKE_COMPILER_IS_GNUCXX)
set_target_properties(smoketkstep209 PROPERTIES COMPILE_FLAGS -mstackrealign)
set_target_properties(smoketkdegltf PROPERTIES COMPILE_FLAGS -mstackrealign)
endif()

# Get rid of the "lib" prefix on archives/DLLs in Windows.
set_target_properties(smoketkstep209 PROPERTIES PREFIX "" IMPORT_PREFIX "")
set_target_properties(smoketkdegltf PROPERTIES PREFIX "" IMPORT_PREFIX "")
endif (WIN32)

install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../tkstep209_smoke.h DESTINATION include/smoke)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/tkstep209.argnames.txt DESTINATION share/smoke)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/tkstep209.typedefs.txt DESTINATION share/smoke)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../tkdegltf_smoke.h DESTINATION include/smoke)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/tkdegltf.argnames.txt DESTINATION share/smoke)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/tkdegltf.typedefs.txt DESTINATION share/smoke)

File renamed without changes.
Loading

0 comments on commit 41dff26

Please sign in to comment.