diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-10 15:25:06 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-11 08:51:17 +0300 |
| commit | cd5db907261e92a27c1b43117e3976dc055246ae (patch) | |
| tree | 61c755b6eb23701e98aef111155ed93c40119d4c /build_files/build_environment/cmake/opencollada.cmake | |
| parent | 6bf003bce065a7e8c36642cc3dc66f722462673f (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/opencollada.cmake')
| -rw-r--r-- | build_files/build_environment/cmake/opencollada.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/build_files/build_environment/cmake/opencollada.cmake b/build_files/build_environment/cmake/opencollada.cmake index 2f5360ba958..c9aee2bfe64 100644 --- a/build_files/build_environment/cmake/opencollada.cmake +++ b/build_files/build_environment/cmake/opencollada.cmake @@ -16,7 +16,7 @@ # # ***** END GPL LICENSE BLOCK ***** -if(UNIX AND NOT APPLE) +if(UNIX) set(OPENCOLLADA_EXTRA_ARGS -DLIBXML2_INCLUDE_DIR=${LIBDIR}/xml2/include/libxml2 -DLIBXML2_LIBRARIES=${LIBDIR}/xml2/lib/libxml2.a) @@ -32,7 +32,7 @@ ExternalProject_Add(external_opencollada INSTALL_DIR ${LIBDIR}/opencollada ) -if(UNIX AND NOT APPLE) +if(UNIX) add_dependencies( external_opencollada external_xml2 @@ -62,4 +62,4 @@ if(WIN32) DEPENDEES install ) endif() -endif()
\ No newline at end of file +endif() |