diff --git a/nix/build-all.py b/nix/build-all.py index a76a53862c..448e3655ec 100644 --- a/nix/build-all.py +++ b/nix/build-all.py @@ -349,14 +349,13 @@ dependency_tree: "dict[str, tuple[str, ...]]" = { "boost": (), "libxml2": (), "python": (), - "occ": ("freetype",), + "occ": (), "pcre": (), "pcre2": (), "json": (), "hdf5": (), "cgal": (), "eigen": (), - "freetype": (), "rocksdb": ("zstd",), "zstd": (), # 'usd': ('boost', 'oneTBB') @@ -951,17 +950,6 @@ if "swig" in targets: revision=f"v{SWIG_VERSION}", ) -if "freetype" in targets: - build_dependency( - name=f"freetype", - mode="cmake", - build_tool_args=[f"-DCMAKE_INSTALL_PREFIX={DEPS_DIR}/install/freetype"], - download_url="https://github.com/freetype/freetype", - download_name="freetype2", - download_tool=download_tool_git, - revision="VER-2-14-0", - ) - if USE_OCCT and "occ" in targets: patches = [] if OCCT_VERSION < "7.4": @@ -996,7 +984,6 @@ if USE_OCCT and "occ" in targets: f"-DUSE_FREETYPE=OFF", f"-DUSE_OPENGL=OFF", f"-DUSE_GLES2=OFF", - f"-D3RDPARTY_FREETYPE_DIR={DEPS_DIR}/install/freetype", f"-DCMAKE_POLICY_VERSION_MINIMUM=3.5", *MAC_CROSS_COMPILE_INTEL_ARGS, ], diff --git a/win/build-deps.cmd b/win/build-deps.cmd index b8e42d14d3..ac523774b5 100644 --- a/win/build-deps.cmd +++ b/win/build-deps.cmd @@ -488,25 +488,6 @@ echo OCC_INSTALL_DIR=%DEPENDENCY_INSTALL_DIR%>>"%~dp0\%BUILD_DEPS_CACHE_PATH%" call :CheckInstallation if %ERRORLEVEL%==200 GOTO %NEXT_DEPENDENCY_LABEL% -:: OCCT has many dependencies but FreeType is the only mandatory -set DEPENDENCY_NAME=FreeType -set DEPENDENCY_DIR=%DEPS_DIR%\freetype-2.7.1 -set FREETYPE_ZIP=VER-2-7-1.zip -cd "%DEPS_DIR%" -call :DownloadFile https://github.com/freetype/freetype/archive/refs/tags/%FREETYPE_ZIP% "%DEPS_DIR%" %FREETYPE_ZIP% -if not %ERRORLEVEL%==0 goto :Error -call :ExtractArchive %FREETYPE_ZIP% "%DEPS_DIR%" "%DEPENDENCY_DIR%" -if not %ERRORLEVEL%==0 goto :Error -if exist "%DEPS_DIR%\freetype-VER-2-7-1" ren "%DEPS_DIR%\freetype-VER-2-7-1" "freetype-2.7.1" -cd "%DEPENDENCY_DIR%" -:: NOTE FreeType is built as a static library by default -call :RunCMake -DCMAKE_INSTALL_PREFIX="%INSTALL_DIR%\freetype" -if not %ERRORLEVEL%==0 goto :Error -call :BuildCMakeProject "%DEPENDENCY_DIR%\%BUILD_DIR%" %BUILD_CFG% -if not %ERRORLEVEL%==0 goto :Error -call :InstallCMakeProject "%DEPENDENCY_DIR%\%BUILD_DIR%" %BUILD_CFG% -if not %ERRORLEVEL%==0 goto :Error - set DEPENDENCY_NAME=Open CASCADE %OCCT_VERSION% set DEPENDENCY_DIR=%DEPS_DIR%\occt_git set DEPENDENCY_INSTALL_NAME=%OCCT_DEPENDENCY_INSTALL_NAME% @@ -529,7 +510,7 @@ cd "%DEPENDENCY_DIR%" :: Temporarily explicitly set `CMAKE_DEBUG_POSTFIX` to empty to override it's perviously being set to `d`. :: OCCT don't need it, since it's layout is separating debug and release build by different folders. call :RunCMake -DINSTALL_DIR="%DEPENDENCY_INSTALL_DIR%" -DBUILD_LIBRARY_TYPE="Static" -DCMAKE_DEBUG_POSTFIX="" ^ - -DBUILD_MODULE_Draw=0 -D3RDPARTY_FREETYPE_DIR="%INSTALL_DIR%\freetype" ^ + -DBUILD_MODULE_Draw=0 -DUSE_FREETYPE=OFF ^ -DBUILD_USE_PCH=ON if not %ERRORLEVEL%==0 goto :Error