Skip to content

Commit 9c1b3ff

Browse files
Reorder some DEPENDS by A-Z. Add small comment
1 parent a878837 commit 9c1b3ff

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

3rdparty/packages/cairo.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
include_guard(GLOBAL)
22

33
ExternalProjectAutotools(cairo
4-
DEPENDS libpng pixman-1 freetype glib-2.0 iconv
4+
DEPENDS freetype glib-2.0 iconv libpng pixman-1
55
URL https://cairographics.org/releases/cairo-1.16.0.tar.xz
66
URL_HASH SHA256=5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331
77
)

3rdparty/packages/libfontforge.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ if (ANDROID)
2626
endif()
2727

2828
ExternalProjectAutotools(libfontforge
29-
DEPENDS libxml-2.0 libjpeg glib-2.0 freetype zlib libintl iconv
29+
DEPENDS freetype glib-2.0 iconv libintl libjpeg libxml-2.0 zlib
3030

3131
URL https://github.com/fontforge/fontforge/releases/download/20190413/fontforge-20190413.tar.gz
3232
URL_HASH SHA256=6762a045aba3d6ff1a7b856ae2e1e900a08a8925ccac5ebf24de91692b206617
3333
CONFIGURE_ARGUMENTS ${FONTFORGE_BUILD_PROGRAMS_ARGUMENT}
3434

35-
# libfontforge check for TIFFRewriteField , which was deprecated in libtiff-4
35+
# libfontforge checks for TIFFRewriteField , which was deprecated in libtiff-4
3636
# http://www.simplesystems.org/libtiff/v4.0.0.html
3737
--without-libtiff
3838
# without cairo too, because of the same libtiff error

3rdparty/packages/libopenjp2.cmake

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@ include_guard(GLOBAL)
33
message(FATAL_ERROR "libopenjp2 disabled, space saving")
44

55
ExternalProjectCMake(libopenjp2
6-
DEPENDS libpng libtiff-4 lcms2
6+
DEPENDS lcms2 libpng libtiff-4
77
URL https://github.com/uclouvain/openjpeg/archive/v2.3.1.tar.gz
88
URL_HASH SHA256=63f5a4713ecafc86de51bfad89cc07bb788e9bba24ebbf0c4ca637621aadb6a9
99
EXTRA_ARGUMENTS
10+
# Force linking against libjpeg when linking against libtiff
1011
UPDATE_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/packages/FixLibopenjp2Source.sh ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2-prefix/src/libopenjp2/
1112
LOG_UPDATE 1
1213
)

0 commit comments

Comments
 (0)