]>
Commit | Line | Data |
---|---|---|
ed18f05b JB |
1 | --- occt-ffce0d6/adm/cmake/occt_toolkit.cmake.orig 2023-03-21 13:36:52.000000000 +0100 |
2 | +++ occt-ffce0d6/adm/cmake/occt_toolkit.cmake 2023-03-30 19:08:14.199142733 +0200 | |
3 | @@ -370,10 +370,6 @@ foreach (USED_ITEM ${USED_EXTERNLIB_AND_ | |
4 | add_definitions (-DHAVE_GLES2) | |
5 | endif() | |
6 | ||
7 | - if ("${CURRENT_CSF}" STREQUAL "${CSF_Draco}") | |
8 | - set (CURRENT_CSF "") | |
9 | - set (USED_DRACO 1) | |
10 | - endif() | |
11 | set (LIBRARY_FROM_CACHE 0) | |
12 | separate_arguments (CURRENT_CSF) | |
13 | foreach (CSF_LIBRARY ${CURRENT_CSF}) | |
14 | @@ -412,28 +408,6 @@ foreach (USED_ITEM ${USED_EXTERNLIB_AND_ | |
15 | endif() | |
16 | endforeach() | |
17 | ||
18 | -if (USE_DRACO) | |
19 | - if (USED_DRACO) | |
20 | - set (USED_LIB_RELEASE ${3RDPARTY_DRACO_LIBRARY}) | |
21 | - if (WIN32) | |
22 | - set (USED_LIB_DEBUG ${3RDPARTY_DRACO_LIBRARY_DEBUG}) | |
23 | - else() | |
24 | - set (USED_LIB_DEBUG ${3RDPARTY_DRACO_LIBRARY}) | |
25 | - endif() | |
26 | - set (USED_LIB_CONF) | |
27 | - if (EXISTS ${USED_LIB_DEBUG}) | |
28 | - set (USED_LIB_CONF "$<$<CONFIG:DEBUG>:${USED_LIB_DEBUG}>;${USED_LIB_CONF}") | |
29 | - endif() | |
30 | - if (EXISTS ${USED_LIB_RELEASE}) | |
31 | - set (USED_LIB_CONF "$<$<CONFIG:RELEASE>:${USED_LIB_RELEASE}>;${USED_LIB_CONF}") | |
32 | - set (USED_LIB_CONF "$<$<CONFIG:RELWITHDEBINFO>:${USED_LIB_RELEASE}>;${USED_LIB_CONF}") | |
33 | - endif() | |
34 | - if (DEFINED USED_LIB_CONF) | |
35 | - set_property (TARGET ${PROJECT_NAME} APPEND PROPERTY LINK_LIBRARIES "${USED_LIB_CONF}") | |
36 | - endif() | |
37 | - endif() | |
38 | -endif() | |
39 | - | |
40 | if (APPLE) | |
41 | list (FIND USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT X11 IS_X11_FOUND) | |
42 | if (NOT ${IS_X11_FOUND} EQUAL -1) |