Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2018-09-10 15:25:06 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2018-09-11 08:51:17 +0300
commitcd5db907261e92a27c1b43117e3976dc055246ae (patch)
tree61c755b6eb23701e98aef111155ed93c40119d4c /build_files/build_environment/cmake/ssl.cmake
parent6bf003bce065a7e8c36642cc3dc66f722462673f (diff)
Build Environment: updates for macOS.
Mainly this is following Linux to build own xml2/lzma/ssl/sqlite and linking them all statically. This ensures the Python ssl module uses a recent openssl version rather than a very old one shipped with macOS.
Diffstat (limited to 'build_files/build_environment/cmake/ssl.cmake')
-rw-r--r--build_files/build_environment/cmake/ssl.cmake12
1 files changed, 8 insertions, 4 deletions
diff --git a/build_files/build_environment/cmake/ssl.cmake b/build_files/build_environment/cmake/ssl.cmake
index dd1b9957cc2..993e6f3ff6a 100644
--- a/build_files/build_environment/cmake/ssl.cmake
+++ b/build_files/build_environment/cmake/ssl.cmake
@@ -19,11 +19,15 @@
set(SSL_CONFIGURE_COMMAND ./Configure)
set(SSL_PATCH_CMD echo .)
-if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
- set(SSL_EXTRA_ARGS enable-ec_nistp_64_gcc_128)
- set(SSL_OS_COMPILER "blender-x86_64")
+if (APPLE)
+ set(SSL_OS_COMPILER "blender-darwin-x86_64")
else()
- set(SSL_OS_COMPILER "blender-x86")
+ if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+ set(SSL_EXTRA_ARGS enable-ec_nistp_64_gcc_128)
+ set(SSL_OS_COMPILER "blender-linux-x86_64")
+ else()
+ set(SSL_OS_COMPILER "blender-linux-x86")
+ endif()
endif()
ExternalProject_Add(external_ssl