Merge branch 'master' of https://github.com/ultralight-ux/WebCore-deps

ultralight-ux · Jun 17, 2021 · 0f25f13 · 0f25f13
2 parents ac265a2 + ad0d41e
commit 0f25f13
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -122,8 +122,14 @@ ExternalProject_Add(freetype
   DEPENDS           zlib libpng
 )
 
+set(HARFBUZZ_ARGS ${COMMON_ARGS} -DHB_HAVE_FREETYPE=ON -DHB_HAVE_ICU=ON -DHB_BUILD_UTILS=OFF -DHB_BUILD_SUBSET=OFF -DHB_BUILD_TESTS=OFF -DFREETYPE_INCLUDE_DIRS=${OUT_DIR}/include -DFREETYPE_LIBRARY=${OUT_DIR}/lib/foobar.a -DICU_ROOT=${OUT_DIR})
+if (PORT MATCHES "UltralightMac")
+  set(CXX_FLAGS "-std=gnu++14")
+  list(APPEND HARFBUZZ_ARGS -DCMAKE_CXX_FLAGS=${CXX_FLAGS} )
+endif ()
+
 ExternalProject_Add(harfbuzz
   SOURCE_DIR        ${SRC_DIR}/harfbuzz-2.6.4
-  CMAKE_ARGS        ${COMMON_ARGS} -DHB_HAVE_FREETYPE=ON -DHB_HAVE_ICU=ON -DHB_BUILD_UTILS=OFF -DHB_BUILD_SUBSET=OFF -DHB_BUILD_TESTS=OFF -DFREETYPE_INCLUDE_DIRS=${OUT_DIR}/include -DFREETYPE_LIBRARY=${OUT_DIR}/lib/foobar.a -DICU_ROOT=${OUT_DIR}
+  CMAKE_ARGS        ${HARFBUZZ_ARGS}
   DEPENDS           freetype icu
 )