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 | |
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')
-rw-r--r-- | build_files/build_environment/cmake/harvest.cmake | 1 | ||||
-rw-r--r-- | build_files/build_environment/cmake/opencollada.cmake | 6 | ||||
-rw-r--r-- | build_files/build_environment/cmake/openvdb.cmake | 3 | ||||
-rw-r--r-- | build_files/build_environment/cmake/osl.cmake | 15 | ||||
-rw-r--r-- | build_files/build_environment/cmake/python.cmake | 28 | ||||
-rw-r--r-- | build_files/build_environment/cmake/ssl.cmake | 12 | ||||
-rw-r--r-- | build_files/build_environment/cmake/ssl.conf | 9 | ||||
-rw-r--r-- | build_files/build_environment/cmake/zlib.cmake | 2 |
8 files changed, 42 insertions, 34 deletions
diff --git a/build_files/build_environment/cmake/harvest.cmake b/build_files/build_environment/cmake/harvest.cmake index d47a5e65d3c..4ec71bf2ed2 100644 --- a/build_files/build_environment/cmake/harvest.cmake +++ b/build_files/build_environment/cmake/harvest.cmake @@ -110,6 +110,7 @@ endfunction() harvest(alembic/include alembic/include "*.h") harvest(alembic/lib/libAlembic.a alembic/lib/libAlembic.a) +harvest(alembic/bin alembic/bin "*") harvest(boost/include boost/include "*") harvest(boost/lib boost/lib "*.a") harvest(ffmpeg/include ffmpeg/include "*.h") 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() diff --git a/build_files/build_environment/cmake/openvdb.cmake b/build_files/build_environment/cmake/openvdb.cmake index a550ed5decb..125c1b2df85 100644 --- a/build_files/build_environment/cmake/openvdb.cmake +++ b/build_files/build_environment/cmake/openvdb.cmake @@ -29,9 +29,7 @@ set(OPENVDB_EXTRA_ARGS -DBoost_NO_SYSTEM_PATHS=ON -DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY} -DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/ - -DWITH_BLOSC=ON -DBLOSC_INCLUDE_DIR=${LIBDIR}/blosc/include/ - -DBLOSC_LIBRARY=${LIBDIR}/blosc/lib/libblosc${BLOSC_POST}${LIBEXT} -DBLOSC_blosc_LIBRARY=${LIBDIR}/blosc/lib/libblosc${BLOSC_POST}${LIBEXT} -DOPENVDB_ENABLE_3_ABI_COMPATIBLE=OFF -DOPENVDB_BUILD_UNITTESTS=Off @@ -48,7 +46,6 @@ set(OPENVDB_EXTRA_ARGS -DOpenexr_ILMIMF_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf${OPENEXR_VERSION_POSTFIX}${LIBEXT} -DTBB_LIBRARYDIR=${LIBDIR}/tbb/lib -DTbb_TBB_LIBRARY=${LIBDIR}/tbb/lib/${LIBPREFIX}tbb_static${LIBEXT} - -DTBB_LIBRARY_DIR=${LIBDIR}/tbb/lib -DTBB_LIBRARY_PATH=${LIBDIR}/tbb/lib ) 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 diff --git a/build_files/build_environment/cmake/python.cmake b/build_files/build_environment/cmake/python.cmake index 22b4052189e..c61a0084b6f 100644 --- a/build_files/build_environment/cmake/python.cmake +++ b/build_files/build_environment/cmake/python.cmake @@ -67,9 +67,6 @@ if(WIN32) message("POutput = ${PYTHON_OUTPUTDIR}") else() if(APPLE) - # we need to add homebrew pkgconfig directories to get ssl, xz - - set(BREW_PKG_CONFIG "/usr/local/opt/openssl/lib/pkgconfig:/usr/local/opt/xz/lib/pkgconfig") # disable functions that can be in 10.13 sdk but aren't available on 10.9 target set(PYTHON_FUNC_CONFIGS export ac_cv_func_futimens=no && @@ -83,25 +80,22 @@ else() export ac_cv_func_mkostemp=no && export ac_cv_func_mkostemps=no && export ac_cv_func_timingsafe_bcmp=no) - - set(PYTHON_CONFIGURE_ENV ${CONFIGURE_ENV} && export PKG_CONFIG_PATH=${BREW_PKG_CONFIG} && ${PYTHON_FUNC_CONFIGS}) + set(PYTHON_CONFIGURE_ENV ${CONFIGURE_ENV} && ${PYTHON_FUNC_CONFIGS}) set(PYTHON_BINARY ${BUILD_DIR}/python/src/external_python/python.exe) - set(PYTHON_PATCH echo .) - set(PYTHON_CONFIGURE_EXTRA_ENV echo .) - set(PYTHON_CONFIGURE_EXTRA_ARGS) else() - set(PYTHON_CONFIGURE_EXTRA_ARGS "--with-openssl=${LIBDIR}/ssl") set(PYTHON_CONFIGURE_ENV ${CONFIGURE_ENV}) - set(PYTHON_CFLAGS "-I${LIBDIR}/sqlite/include -I${LIBDIR}/bzip2/include -I${LIBDIR}/lzma/include -I${LIBDIR}/zlib/include") - set(PYTHON_LDFLAGS "-L${LIBDIR}/sqlite/lib -L${LIBDIR}/bzip2/lib -L${LIBDIR}/lzma/lib -L${LIBDIR}/zlib/lib") - set(PYTHON_CONFIGURE_EXTRA_ENV - export CFLAGS=${PYTHON_CFLAGS} && - export CPPFLAGS=${PYTHON_CFLAGS} && - export LDFLAGS=${PYTHON_LDFLAGS}) set(PYTHON_BINARY ${BUILD_DIR}/python/src/external_python/python) - set(PYTHON_PATCH ${PATCH_CMD} --verbose -p1 -d ${BUILD_DIR}/python/src/external_python < ${PATCH_DIR}/python_linux.diff) endif() + set(PYTHON_CONFIGURE_EXTRA_ARGS "--with-openssl=${LIBDIR}/ssl") + set(PYTHON_CFLAGS "-I${LIBDIR}/sqlite/include -I${LIBDIR}/bzip2/include -I${LIBDIR}/lzma/include -I${LIBDIR}/zlib/include") + set(PYTHON_LDFLAGS "-L${LIBDIR}/sqlite/lib -L${LIBDIR}/bzip2/lib -L${LIBDIR}/lzma/lib -L${LIBDIR}/zlib/lib") + set(PYTHON_CONFIGURE_EXTRA_ENV + export CFLAGS=${PYTHON_CFLAGS} && + export CPPFLAGS=${PYTHON_CFLAGS} && + export LDFLAGS=${PYTHON_LDFLAGS}) + set(PYTHON_PATCH ${PATCH_CMD} --verbose -p1 -d ${BUILD_DIR}/python/src/external_python < ${PATCH_DIR}/python_linux.diff) + ExternalProject_Add(external_python URL ${PYTHON_URI} DOWNLOAD_DIR ${DOWNLOAD_DIR} @@ -172,7 +166,7 @@ if(MSVC) add_custom_target(Make_Python_Environment ALL DEPENDS ${BUILD_DIR}/python/src/external_python/run/python${PYTHON_POSTFIX}.exe Package_Python) endif() -if(UNIX AND NOT APPLE) +if(UNIX) add_dependencies( external_python external_bzip2 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 diff --git a/build_files/build_environment/cmake/ssl.conf b/build_files/build_environment/cmake/ssl.conf index a9534e56291..91f4357f8d8 100644 --- a/build_files/build_environment/cmake/ssl.conf +++ b/build_files/build_environment/cmake/ssl.conf @@ -1,10 +1,15 @@ %targets = ( - "blender-x86" => { + + "blender-linux-x86" => { inherit_from => [ "linux-x86" ], cflags => add("-fPIC"), }, - "blender-x86_64" => { + "blender-linux-x86_64" => { inherit_from => [ "linux-x86_64" ], cflags => add("-fPIC"), }, + "blender-darwin-x86_64" => { + inherit_from => [ "darwin64-x86_64-cc" ], + cflags => add("-fPIC"), + }, ); diff --git a/build_files/build_environment/cmake/zlib.cmake b/build_files/build_environment/cmake/zlib.cmake index 7bf1c45e359..396bb3a318e 100644 --- a/build_files/build_environment/cmake/zlib.cmake +++ b/build_files/build_environment/cmake/zlib.cmake @@ -46,7 +46,7 @@ else() DEPENDEES install ) endif() - if (UNIX AND NOT APPLE) + if (UNIX) ExternalProject_Add_Step(external_zlib after_install COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/zlib/lib/libz.a ${LIBDIR}/zlib/lib/libz_pic.a DEPENDEES install |