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/osl.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/osl.cmake')
-rw-r--r--build_files/build_environment/cmake/osl.cmake15
1 files changed, 11 insertions, 4 deletions
diff --git a/build_files/build_environment/cmake/osl.cmake b/build_files/build_environment/cmake/osl.cmake
index eaf6a62d18a..795892f29e2 100644
--- a/build_files/build_environment/cmake/osl.cmake
+++ b/build_files/build_environment/cmake/osl.cmake
@@ -77,10 +77,17 @@ set(OSL_EXTRA_ARGS
)
if(WIN32)
-set(OSL_EXTRA_ARGS
- ${OSL_EXTRA_FLAGS}
- -DPUGIXML_HOME=${LIBDIR}/pugixml
-)
+ set(OSL_EXTRA_ARGS
+ ${OSL_EXTRA_ARGS}
+ -DPUGIXML_HOME=${LIBDIR}/pugixml
+ )
+elseif(APPLE)
+ # Make symbol hiding consistent with OIIO which defaults to OFF,
+ # avoids linker warnings on macOS
+ set(OSL_EXTRA_ARGS
+ ${OSL_EXTRA_ARGS}
+ -DHIDE_SYMBOLS=OFF
+ )
endif()
ExternalProject_Add(external_osl