Skip to content

Commit 3f4e3d0

Browse files
committed
revert occt cmakelist
1 parent e249947 commit 3f4e3d0

File tree

1 file changed

+8
-23
lines changed

1 file changed

+8
-23
lines changed

src/occt_wrapper/CMakeLists.txt

+8-23
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ include(GenerateExportHeader)
2020

2121
generate_export_header(OCCTWrapper)
2222

23-
find_package(OpenCASCADE REQUIRED)
24-
if (OpenCASCADE_VERSION VERSION_LESS 7.6.2)
25-
message(FATAL_ERROR "OpenCASCADE v7 >= v7.6.2 must be used")
26-
elseif (OpenCASCADE_VERSION VERSION_GREATER_EQUAL 8.0.0)
27-
message(FATAL_ERROR "OpenCASCADE v7 >= v7.6.2 must be used")
28-
endif ()
23+
find_package(OpenCASCADE 7.6.2 REQUIRED)
2924

3025
set(OCCT_LIBS
26+
TKXDESTEP
27+
TKSTEP
28+
TKSTEP209
29+
TKSTEPAttr
30+
TKSTEPBase
3131
TKXCAF
3232
TKXSBase
3333
TKVCAF
@@ -52,23 +52,8 @@ set(OCCT_LIBS
5252
)
5353

5454
message(STATUS "OpenCASCADE_VERSION: '${OpenCASCADE_VERSION}'")
55-
if (OpenCASCADE_VERSION VERSION_LESS 7.8.0)
56-
message(STATUS "OpenCASCADE_VERSION version < 7.8.0, using TKXDESTEP TKSTEP TKSTEP209 TKSTEPAttr TKSTEPBase")
57-
list(APPEND OCCT_LIBS
58-
TKXDESTEP
59-
TKSTEP
60-
TKSTEP209
61-
TKSTEPAttr
62-
TKSTEPBase
63-
)
64-
else()
65-
message(STATUS "OpenCASCADE_VERSION version >= 7.8.0, using TKDESTEP TKXSDRAWSTEP")
66-
list(APPEND OCCT_LIBS
67-
TKDESTEP
68-
TKXSDRAWSTEP
69-
)
70-
endif()
7155

56+
message(STATUS "OCCT_LIBS: '${OCCT_LIBS}'")
7257
slic3r_remap_configs("${OCCT_LIBS}" RelWithDebInfo Release)
7358

7459
target_include_directories(OCCTWrapper PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
@@ -77,5 +62,5 @@ target_link_libraries(OCCTWrapper ${OCCT_LIBS})
7762

7863
include(GNUInstallDirs)
7964

80-
install(TARGETS OCCTWrapper DESTINATION "${CMAKE_INSTALL_LIBDIR}/superslicer")
65+
install(TARGETS OCCTWrapper DESTINATION "${CMAKE_INSTALL_BINDIR}")
8166

0 commit comments

Comments
 (0)