mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-11-02 20:51:23 -07:00
0a064e980b
1. update openssl to 3.1 2. update zlib to 1.2.13 3. update expat to 2.5 Change-Id: I46ac38f8e5acab4abae42645a56eec7d9381865e (cherry picked from commit 34013820d325c41e1514d0f334f3c2be53145852)
39 lines
1.6 KiB
Diff
39 lines
1.6 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index b412dc7..5ca7fa8 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -147,10 +147,12 @@ if(MINGW)
|
|
set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj)
|
|
endif(MINGW)
|
|
|
|
-add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
|
|
-add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
|
|
-set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
|
|
-set_target_properties(zlib PROPERTIES SOVERSION 1)
|
|
+add_library(zlib ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
|
|
+if (BUILD_SHARED_LIBS)
|
|
+ target_sources(zlib PRIVATE ${ZLIB_DLL_SRCS})
|
|
+ set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
|
|
+ set_target_properties(zlib PROPERTIES SOVERSION 1)
|
|
+endif()
|
|
|
|
if(NOT CYGWIN)
|
|
# This property causes shared libraries on Linux to have the full version
|
|
@@ -165,7 +167,7 @@ endif()
|
|
|
|
if(UNIX)
|
|
# On unix-like platforms the library is almost always called libz
|
|
- set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z)
|
|
+ set_target_properties(zlib PROPERTIES OUTPUT_NAME z)
|
|
if(NOT APPLE)
|
|
set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"")
|
|
endif()
|
|
@@ -175,7 +177,7 @@ elseif(BUILD_SHARED_LIBS AND WIN32)
|
|
endif()
|
|
|
|
if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL )
|
|
- install(TARGETS zlib zlibstatic
|
|
+ install(TARGETS zlib
|
|
RUNTIME DESTINATION "${INSTALL_BIN_DIR}"
|
|
ARCHIVE DESTINATION "${INSTALL_LIB_DIR}"
|
|
LIBRARY DESTINATION "${INSTALL_LIB_DIR}" )
|