]>
Commit | Line | Data |
---|---|---|
f3028839 JB |
1 | --- OpenCOLLADA-1.6.68/CMakeLists.txt.orig 2018-11-26 23:43:10.000000000 +0100 |
2 | +++ OpenCOLLADA-1.6.68/CMakeLists.txt 2023-04-01 21:00:52.307371195 +0200 | |
3 | @@ -274,7 +274,6 @@ add_subdirectory(common/libftoa) | |
4 | add_subdirectory(${EXTERNAL_LIBRARIES}/UTF)\r | |
5 | add_subdirectory(common/libBuffer)\r | |
6 | add_subdirectory(${EXTERNAL_LIBRARIES}/MathMLSolver)\r | |
7 | -add_subdirectory(${EXTERNAL_LIBRARIES}/zlib)\r | |
8 | \r | |
9 | # building OpenCOLLADA libs\r | |
10 | add_subdirectory(COLLADABaseUtils)\r | |
11 | --- OpenCOLLADA-1.6.68/DAEValidator/CMakeLists.txt.orig 2018-11-26 23:43:10.000000000 +0100 | |
12 | +++ OpenCOLLADA-1.6.68/DAEValidator/CMakeLists.txt 2023-04-01 21:20:25.487682198 +0200 | |
13 | @@ -80,14 +80,7 @@ if (NOT LIBXML2_FOUND) | |
14 | else () | |
15 | list(APPEND Libraries ${LIBXML2_LIBRARIES}) | |
16 | endif () | |
17 | -if (USE_STATIC) | |
18 | - list(APPEND Libraries zlib_static) | |
19 | - else () | |
20 | - list(APPEND Libraries zlib_shared) | |
21 | - endif () | |
22 | -if (WIN32) | |
23 | - list(APPEND Libraries ws2_32.lib) | |
24 | -endif () | |
25 | +list(APPEND Libraries z) | |
26 | target_link_libraries(DAEValidatorExecutable ${Libraries}) | |
27 | set_target_properties(DAEValidatorExecutable PROPERTIES OUTPUT_NAME DAEValidator) | |
28 |