diff --git a/build/cmake/third-party/dependencies_allplatforms.txt b/build/cmake/third-party/dependencies_allplatforms.txt index b87b7bc21..ae0f3f799 100644 --- a/build/cmake/third-party/dependencies_allplatforms.txt +++ b/build/cmake/third-party/dependencies_allplatforms.txt @@ -7,7 +7,7 @@ giflib openxr tinyxml2 protozero -harfbuzz +#harfbuzz mbedtls libpng libtiff diff --git a/build/cmake/third-party/freetype.cmake b/build/cmake/third-party/freetype.cmake index 74ac8d7e2..1ba745807 100644 --- a/build/cmake/third-party/freetype.cmake +++ b/build/cmake/third-party/freetype.cmake @@ -8,7 +8,10 @@ list(APPEND CMAKE_MESSAGE_INDENT " ") find_package(Git REQUIRED) +set(FT_DISABLE_BROTLI TRUE) set(FT_DISABLE_BZIP2 TRUE) +set(FT_REQUIRE_HARFBUZZ FALSE) + set(ZLIB_ROOT ${CMAKE_INSTALL_PREFIX}) set(PNG_ROOT ${CMAKE_INSTALL_PREFIX}) diff --git a/build/cmake/third-party/libtiff.cmake b/build/cmake/third-party/libtiff.cmake index 58564ecab..0675a473a 100644 --- a/build/cmake/third-party/libtiff.cmake +++ b/build/cmake/third-party/libtiff.cmake @@ -12,14 +12,12 @@ set(tiff-tests OFF CACHE BOOL "") set(tiff-contrib OFF CACHE BOOL "") set(HAVE_LD_VERSION_SCRIPT OFF) -if (LINUX) - # Explicitly disable these codes because they cause build errors on Github. - set(libdeflate OFF) - set(lzma OFF) - set(jbig OFF) - set(webp OFF) - set(zstd OFF) -endif() +# Explicitly disable the following codes +set(libdeflate OFF) +set(lzma OFF) +set(jbig OFF) +set(webp OFF) +set(zstd OFF) find_package(Git REQUIRED) diff --git a/impl/application/ocean/demo/tracking/featuretracker/CMakeLists.txt b/impl/application/ocean/demo/tracking/featuretracker/CMakeLists.txt index 0dcbb2aa1..5cb910dc3 100644 --- a/impl/application/ocean/demo/tracking/featuretracker/CMakeLists.txt +++ b/impl/application/ocean/demo/tracking/featuretracker/CMakeLists.txt @@ -243,6 +243,7 @@ if (IOS) file(GLOB OCEAN_TARGET_STORYBOARDS "${CMAKE_SOURCE_DIR}/res/application/ocean/demo/tracking/featuretracker/ios/*.xib") file(GLOB OCEAN_TARGET_IMAGE_RESOURCES "${CMAKE_SOURCE_DIR}/res/application/ocean/demo/tracking/featuretracker/*.bmp" + "${CMAKE_SOURCE_DIR}/res/application/ocean/demo/tracking/featuretracker/*.jpg" "${CMAKE_SOURCE_DIR}/res/application/ocean/demo/tracking/featuretracker/*.obj" "${CMAKE_SOURCE_DIR}/res/application/ocean/demo/tracking/featuretracker/*.png" "${CMAKE_SOURCE_DIR}/res/application/ocean/demo/tracking/featuretracker/*.txt" diff --git a/impl/ocean/cv/fonts/CMakeLists.txt b/impl/ocean/cv/fonts/CMakeLists.txt index 38e80cc3a..9cae5f494 100644 --- a/impl/ocean/cv/fonts/CMakeLists.txt +++ b/impl/ocean/cv/fonts/CMakeLists.txt @@ -10,7 +10,7 @@ if (MACOS OR ANDROID OR IOS OR LINUX OR WIN32) set(OCEAN_TARGET_NAME "ocean_cv_fonts") find_package(Freetype REQUIRED) - find_package(HarfBuzz REQUIRED) +# find_package(HarfBuzz REQUIRED) find_package(PNG REQUIRED) # Source files @@ -38,11 +38,11 @@ if (MACOS OR ANDROID OR IOS OR LINUX OR WIN32) ocean_io ocean_math Freetype::Freetype - ${HarfBuzz_LIBRARY} +# ${HarfBuzz_LIBRARY} PNG::PNG ) - target_include_directories(${OCEAN_TARGET_NAME} PRIVATE ${HarfBuzz_INCLUDE_DIRS}) +# target_include_directories(${OCEAN_TARGET_NAME} PRIVATE ${HarfBuzz_INCLUDE_DIRS}) # Installation install(TARGETS ${OCEAN_TARGET_NAME}