diff options
Diffstat (limited to 'build_files')
-rw-r--r-- | build_files/build_environment/cmake/boost.cmake | 9 | ||||
-rw-r--r-- | build_files/build_environment/windows/build_deps.cmd | 53 | ||||
-rw-r--r-- | build_files/cmake/Modules/FindBrotli.cmake | 2 | ||||
-rw-r--r-- | build_files/cmake/platform/platform_unix.cmake | 31 |
4 files changed, 50 insertions, 45 deletions
diff --git a/build_files/build_environment/cmake/boost.cmake b/build_files/build_environment/cmake/boost.cmake index 5170a3a123e..f2944a41af8 100644 --- a/build_files/build_environment/cmake/boost.cmake +++ b/build_files/build_environment/cmake/boost.cmake @@ -25,8 +25,13 @@ else() endif() if(WIN32) - set(BOOST_TOOLSET toolset=msvc-14.1) - set(BOOST_COMPILER_STRING -vc141) + if(MSVC_VERSION GREATER_EQUAL 1920) # 2019 + set(BOOST_TOOLSET toolset=msvc-14.2) + set(BOOST_COMPILER_STRING -vc142) + else() # 2017 + set(BOOST_TOOLSET toolset=msvc-14.1) + set(BOOST_COMPILER_STRING -vc141) + endif() set(BOOST_CONFIGURE_COMMAND bootstrap.bat) set(BOOST_BUILD_COMMAND b2) diff --git a/build_files/build_environment/windows/build_deps.cmd b/build_files/build_environment/windows/build_deps.cmd index 5174af8e20d..c0e13ac3a55 100644 --- a/build_files/build_environment/windows/build_deps.cmd +++ b/build_files/build_environment/windows/build_deps.cmd @@ -1,19 +1,5 @@ @echo off if NOT "%1" == "" ( - if "%1" == "2013" ( - echo "Building for VS2013" - set VSVER=12.0 - set VSVER_SHORT=12 - set BuildDir=VS12 - goto par2 - ) - if "%1" == "2015" ( - echo "Building for VS2015" - set VSVER=14.0 - set VSVER_SHORT=14 - set BuildDir=VS14 - goto par2 - ) if "%1" == "2017" ( echo "Building for VS2017" set VSVER=15.0 @@ -21,44 +7,33 @@ if NOT "%1" == "" ( set BuildDir=VS15 goto par2 ) + if "%1" == "2019" ( + echo "Building for VS2019" + set VSVER=15.0 + set VSVER_SHORT=15 + set BuildDir=VS15 + goto par2 + ) ) :usage -Echo Usage build_deps 2013/2015/2017 x64/x86 +Echo Usage build_deps 2017/2019 x64 goto exit :par2 if NOT "%2" == "" ( - if "%2" == "x86" ( - echo "Building for x86" - set HARVESTROOT=Windows_vc - set ARCH=86 - if "%1" == "2013" ( - set CMAKE_BUILDER=Visual Studio 12 2013 - ) - if "%1" == "2015" ( - set CMAKE_BUILDER=Visual Studio 14 2015 - ) - if "%1" == "2017" ( - set CMAKE_BUILDER=Visual Studio 15 2017 - ) - - goto start - ) if "%2" == "x64" ( echo "Building for x64" set HARVESTROOT=Win64_vc set ARCH=64 - if "%1" == "2013" ( - set CMAKE_BUILDER=Visual Studio 12 2013 Win64 - ) - if "%1" == "2015" ( - set CMAKE_BUILDER=Visual Studio 14 2015 Win64 + if "%1" == "2019" ( + set CMAKE_BUILDER=Visual Studio 16 2019 + set CMAKE_BUILD_ARCH=-A x64 ) if "%1" == "2017" ( set CMAKE_BUILDER=Visual Studio 15 2017 Win64 + set CMAKE_BUILD_ARCH= ) - goto start ) ) @@ -120,7 +95,7 @@ set path=%BUILD_DIR%\downloads\mingw\mingw64\msys\1.0\bin\;%BUILD_DIR%\downloads mkdir %STAGING%\%BuildDir%%ARCH%R cd %Staging%\%BuildDir%%ARCH%R echo %DATE% %TIME% : Start > %StatusFile% -cmake -G "%CMAKE_BUILDER%" -Thost=x64 %SOURCE_DIR% -DPACKAGE_DIR=%BUILD_DIR%/packages -DDOWNLOAD_DIR=%BUILD_DIR%/downloads -DBUILD_MODE=Release -DHARVEST_TARGET=%HARVEST_DIR%/%HARVESTROOT%%VSVER_SHORT%/ +cmake -G "%CMAKE_BUILDER%" %CMAKE_BUILD_ARCH% -Thost=x64 %SOURCE_DIR% -DPACKAGE_DIR=%BUILD_DIR%/packages -DDOWNLOAD_DIR=%BUILD_DIR%/downloads -DBUILD_MODE=Release -DHARVEST_TARGET=%HARVEST_DIR%/%HARVESTROOT%%VSVER_SHORT%/ echo %DATE% %TIME% : Release Configuration done >> %StatusFile% if "%dobuild%" == "1" ( msbuild /m "ll.vcxproj" /p:Configuration=Release /fl /flp:logfile=BlenderDeps_llvm.log;Verbosity=normal @@ -133,7 +108,7 @@ if "%NODEBUG%" == "1" goto exit cd %BUILD_DIR% mkdir %STAGING%\%BuildDir%%ARCH%D cd %Staging%\%BuildDir%%ARCH%D -cmake -G "%CMAKE_BUILDER%" -Thost=x64 %SOURCE_DIR% -DPACKAGE_DIR=%BUILD_DIR%/packages -DDOWNLOAD_DIR=%BUILD_DIR%/downloads -DCMAKE_BUILD_TYPE=Debug -DBUILD_MODE=Debug -DHARVEST_TARGET=%HARVEST_DIR%/%HARVESTROOT%%VSVER_SHORT%/ %CMAKE_DEBUG_OPTIONS% +cmake -G "%CMAKE_BUILDER%" %CMAKE_BUILD_ARCH% -Thost=x64 %SOURCE_DIR% -DPACKAGE_DIR=%BUILD_DIR%/packages -DDOWNLOAD_DIR=%BUILD_DIR%/downloads -DCMAKE_BUILD_TYPE=Debug -DBUILD_MODE=Debug -DHARVEST_TARGET=%HARVEST_DIR%/%HARVESTROOT%%VSVER_SHORT%/ %CMAKE_DEBUG_OPTIONS% echo %DATE% %TIME% : Debug Configuration done >> %StatusFile% if "%dobuild%" == "1" ( msbuild /m "ll.vcxproj" /p:Configuration=Debug /fl /flp:logfile=BlenderDeps_llvm.log;;Verbosity=normal diff --git a/build_files/cmake/Modules/FindBrotli.cmake b/build_files/cmake/Modules/FindBrotli.cmake index 7460a87b14a..d1e40b1966a 100644 --- a/build_files/cmake/Modules/FindBrotli.cmake +++ b/build_files/cmake/Modules/FindBrotli.cmake @@ -75,6 +75,8 @@ ENDIF() MARK_AS_ADVANCED( BROTLI_INCLUDE_DIR + BROTLI_LIBRARY_COMMON + BROTLI_LIBRARY_DEC BROTLI_LIBRARY_DIR ) diff --git a/build_files/cmake/platform/platform_unix.cmake b/build_files/cmake/platform/platform_unix.cmake index 5778699ee49..261a794b5c8 100644 --- a/build_files/cmake/platform/platform_unix.cmake +++ b/build_files/cmake/platform/platform_unix.cmake @@ -48,6 +48,9 @@ if(NOT DEFINED LIBDIR) unset(LIBDIR_CENTOS7_ABI) endif() +# Support restoring this value once pre-compiled libraries have been handled. +set(WITH_STATIC_LIBS_INIT ${WITH_STATIC_LIBS}) + if(EXISTS ${LIBDIR}) message(STATUS "Using pre-compiled LIBDIR: ${LIBDIR}") @@ -101,10 +104,15 @@ find_package_wrapper(PNG REQUIRED) find_package_wrapper(ZLIB REQUIRED) find_package_wrapper(Zstd REQUIRED) -# FreeType compiled with Brotli compression for woff2. -find_package_wrapper(Freetype REQUIRED) -if(EXISTS ${LIBDIR}) - find_package_wrapper(Brotli REQUIRED) +if(NOT WITH_SYSTEM_FREETYPE) + # FreeType compiled with Brotli compression for woff2. + find_package_wrapper(Freetype REQUIRED) + if(EXISTS ${LIBDIR}) + find_package_wrapper(Brotli REQUIRED) + list(APPEND FREETYPE_LIBRARIES + ${BROTLI_LIBRARIES} + ) + endif() endif() if(WITH_PYTHON) @@ -541,6 +549,21 @@ add_definitions(-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE # # Keep last, so indirectly linked libraries don't override our own pre-compiled libs. +if(EXISTS ${LIBDIR}) + # Clear the prefix path as it causes the `LIBDIR` to override system locations. + unset(CMAKE_PREFIX_PATH) + + # Since the pre-compiled `LIBDIR` directories have been handled, don't prefer static libraries. + set(WITH_STATIC_LIBS ${WITH_STATIC_LIBS_INIT}) +endif() + +if(WITH_SYSTEM_FREETYPE) + find_package_wrapper(Freetype) + if(NOT FREETYPE_FOUND) + message(FATAL_ERROR "Failed finding system FreeType version!") + endif() +endif() + if(WITH_LZO AND WITH_SYSTEM_LZO) find_package_wrapper(LZO) if(NOT LZO_FOUND) |