mirror of
https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git
synced 2025-08-16 20:15:55 +08:00
Merge branch 'tm_mac_system_libcurl'
This commit is contained in:
commit
e98faf8541
7
deps/CMakeLists.txt
vendored
7
deps/CMakeLists.txt
vendored
@ -29,6 +29,7 @@ project(PrusaSlicer_deps)
|
|||||||
# Redefine BUILD_SHARED_LIBS with default being OFF
|
# Redefine BUILD_SHARED_LIBS with default being OFF
|
||||||
option(BUILD_SHARED_LIBS "Build shared libraries instead of static (experimental)" OFF)
|
option(BUILD_SHARED_LIBS "Build shared libraries instead of static (experimental)" OFF)
|
||||||
|
|
||||||
|
# List libraries to be excluded from build
|
||||||
set(${PROJECT_NAME}_PACKAGE_EXCLUDES "" CACHE STRING "Exclude packages matching this regex pattern")
|
set(${PROJECT_NAME}_PACKAGE_EXCLUDES "" CACHE STRING "Exclude packages matching this regex pattern")
|
||||||
|
|
||||||
# Support legacy parameter DESTDIR
|
# Support legacy parameter DESTDIR
|
||||||
@ -151,8 +152,14 @@ set(SYSTEM_PROVIDED_PACKAGES OpenGL)
|
|||||||
if (UNIX)
|
if (UNIX)
|
||||||
# On UNIX systems (including Apple) ZLIB should be available
|
# On UNIX systems (including Apple) ZLIB should be available
|
||||||
list(APPEND SYSTEM_PROVIDED_PACKAGES ZLIB)
|
list(APPEND SYSTEM_PROVIDED_PACKAGES ZLIB)
|
||||||
|
if (APPLE)
|
||||||
|
# Deal with CURL on Apple (See issue #5984 on GH):
|
||||||
|
# Mac SDK should include CURL from at least version 10.12
|
||||||
|
list(APPEND SYSTEM_PROVIDED_PACKAGES CURL)
|
||||||
|
endif ()
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
|
|
||||||
list(APPEND SYSTEM_PROVIDED_PACKAGES ${${PROJECT_NAME}_PLATFORM_PACKAGES})
|
list(APPEND SYSTEM_PROVIDED_PACKAGES ${${PROJECT_NAME}_PLATFORM_PACKAGES})
|
||||||
list(REMOVE_DUPLICATES SYSTEM_PROVIDED_PACKAGES)
|
list(REMOVE_DUPLICATES SYSTEM_PROVIDED_PACKAGES)
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user