File 56db7728d4f4534c83eb875174560c0a7f978cb8.patch of Package musescore

Overview Repositories Revisions Requests Users Attributes Meta

File 56db7728d4f4534c83eb875174560c0a7f978cb8.patch of Package musescore (Revision 8343d7438744ca41fabba1d9aa377af2)

Currently displaying revision 8343d7438744ca41fabba1d9aa377af2 , Show latest

commit 56db7728d4f4534c83eb875174560c0a7f978cb8
Author: Jerry James <loganjerry@gmail.com>
Date:   Tue Aug 27 20:09:54 2024 -0600

Skip harfbuzz download with system freetype

diff --git a/src/framework/draw/CMakeLists.txt b/src/framework/draw/CMakeLists.txt
index 96009e63f0..e4048233b7 100644
--- a/src/framework/draw/CMakeLists.txt
+++ b/src/framework/draw/CMakeLists.txt
@@ -108,38 +108,40 @@ else()
 
     include(cmake/SetupFreeType.cmake)
 
-    # add harfbuzz
-    # in the future this needs to be moved to some function in a separate file
-    set(REMOTE_ROOT_URL https://raw.githubusercontent.com/musescore/muse_deps/main)
-    set(remote_url ${REMOTE_ROOT_URL}/harfbuzz/7.1.0)
-    set(local_path ${CMAKE_CURRENT_LIST_DIR}/_deps/harfbuzz)
-    if (NOT EXISTS ${local_path}/harfbuzz.cmake)
-        file(MAKE_DIRECTORY ${local_path})
-        file(DOWNLOAD ${remote_url}/harfbuzz.cmake ${local_path}/harfbuzz.cmake
-            HTTPHEADER "Cache-Control: no-cache"
+    if (NOT MUE_COMPILE_USE_SYSTEM_FREETYPE)
+        # add harfbuzz
+        # in the future this needs to be moved to some function in a separate file
+        set(REMOTE_ROOT_URL https://raw.githubusercontent.com/musescore/muse_deps/main)
+        set(remote_url ${REMOTE_ROOT_URL}/harfbuzz/7.1.0)
+        set(local_path ${CMAKE_CURRENT_LIST_DIR}/_deps/harfbuzz)
+        if (NOT EXISTS ${local_path}/harfbuzz.cmake)
+            file(MAKE_DIRECTORY ${local_path})
+            file(DOWNLOAD ${remote_url}/harfbuzz.cmake ${local_path}/harfbuzz.cmake
+                HTTPHEADER "Cache-Control: no-cache"
+            )
+        endif()
+
+        include(${local_path}/harfbuzz.cmake)
+
+        # func from ${name}.cmake)
+        cmake_language(CALL harfbuzz_Populate ${remote_url} ${local_path} "source" "" "")
+
+        add_subdirectory(_deps/harfbuzz/harfbuzz)
+        target_no_warning(harfbuzz -Wno-conversion)
+        target_no_warning(harfbuzz -Wno-unused-parameter)
+        target_no_warning(harfbuzz -Wno-unused-variable)
+        target_no_warning(harfbuzz -WMSVC-no-hides-previous)
+        target_no_warning(harfbuzz -WMSVC-no-unreachable)
+
+        #add_subdirectory(thirdparty/msdfgen)
+
+        set(MODULE_INCLUDE
+            ${FREETYPE_INCLUDE_DIRS}
+            ${CMAKE_CURRENT_LIST_DIR}/_deps/harfbuzz/harfbuzz/harfbuzz/src
+            #${CMAKE_CURRENT_LIST_DIR}/thirdparty/msdfgen/msdfgen-1.4
         )
     endif()
 
-    include(${local_path}/harfbuzz.cmake)
-
-    # func from ${name}.cmake)
-    cmake_language(CALL harfbuzz_Populate ${remote_url} ${local_path} "source" "" "")
-
-    add_subdirectory(_deps/harfbuzz/harfbuzz)
-    target_no_warning(harfbuzz -Wno-conversion)
-    target_no_warning(harfbuzz -Wno-unused-parameter)
-    target_no_warning(harfbuzz -Wno-unused-variable)
-    target_no_warning(harfbuzz -WMSVC-no-hides-previous)
-    target_no_warning(harfbuzz -WMSVC-no-unreachable)
-
-    #add_subdirectory(thirdparty/msdfgen)
-
-    set(MODULE_INCLUDE
-        ${FREETYPE_INCLUDE_DIRS}
-        ${CMAKE_CURRENT_LIST_DIR}/_deps/harfbuzz/harfbuzz/harfbuzz/src
-        #${CMAKE_CURRENT_LIST_DIR}/thirdparty/msdfgen/msdfgen-1.4
-    )
-
     set(MODULE_DEF ${MODULE_DEF} -DMUSE_MODULE_DRAW_USE_QTTEXTDRAW)
 
     set(MODULE_LINK ${FREETYPE_LIBRARIES} harfbuzz )#msdfgen)

Places

File 56db7728d4f4534c83eb875174560c0a7f978cb8.patch of Package musescore (Revision 8343d7438744ca41fabba1d9aa377af2)

Places