Skip to content

Commit d94d8c2

Browse files
zhongflyzhongfly
committed
packages: use unified meson_conf_args variable
1 parent 0ed729c commit d94d8c2

14 files changed

Lines changed: 21 additions & 60 deletions

‎cmake/packages_check.cmake‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,9 @@ set(cmake_conf_args
7979
-DBUILD_TESTING=OFF
8080
-DCMAKE_POLICY_VERSION_MINIMUM=3.5
8181
)
82-
82+
set(meson_conf_args
83+
--cross-file=${MESON_CROSS}
84+
)
8385
set(autoreconf_conf_args
8486
--host=${TARGET_ARCH}
8587
--prefix=${MINGW_INSTALL_PREFIX}

‎meson_cross.txt.in‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,9 @@ system = 'windows'
1515
cpu_family = '@TARGET_CPU_FAMILY@'
1616
cpu = '@TARGET_ARCH@'
1717
endian = 'little'
18+
19+
[built-in options]
20+
prefix = '@MINGW_INSTALL_PREFIX@'
21+
libdir = '@MINGW_INSTALL_PREFIX@/lib'
22+
buildtype = 'release'
23+
default_library = 'static'

‎packages/dav1d.cmake‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,7 @@ ExternalProject_Add(dav1d
66
GIT_CLONE_FLAGS "--filter=tree:0"
77
UPDATE_COMMAND ""
88
CONFIGURE_COMMAND ${EXEC} CONF=1 meson setup <BINARY_DIR> <SOURCE_DIR>
9-
--prefix=${MINGW_INSTALL_PREFIX}
10-
--libdir=${MINGW_INSTALL_PREFIX}/lib
11-
--cross-file=${MESON_CROSS}
12-
--buildtype=release
13-
--default-library=static
9+
${meson_conf_args}
1410
-Denable_tools=false
1511
-Denable_tests=false
1612
-Dxxhash_muxer=enabled

‎packages/fontconfig.cmake‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,7 @@ ExternalProject_Add(fontconfig
1414
CONFIGURE_COMMAND ""
1515
COMMAND ${EXEC} sed -i "s/both_libraries/library/g" <SOURCE_DIR>/src/meson.build
1616
COMMAND ${EXEC} CONF=1 meson setup <BINARY_DIR> <SOURCE_DIR>
17-
--prefix=${MINGW_INSTALL_PREFIX}
18-
--libdir=${MINGW_INSTALL_PREFIX}/lib
19-
--cross-file=${MESON_CROSS}
20-
--buildtype=release
21-
--default-library=static
17+
${meson_conf_args}
2218
-Ddoc=disabled
2319
-Dtests=disabled
2420
-Dtools=disabled

‎packages/freetype2.cmake‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,7 @@ ExternalProject_Add(freetype2
99
GIT_SUBMODULES ""
1010
UPDATE_COMMAND ""
1111
CONFIGURE_COMMAND ${EXEC} CONF=1 meson setup <BINARY_DIR> <SOURCE_DIR>
12-
--prefix=${MINGW_INSTALL_PREFIX}
13-
--libdir=${MINGW_INSTALL_PREFIX}/lib
14-
--cross-file=${MESON_CROSS}
15-
--buildtype=release
16-
--default-library=static
12+
${meson_conf_args}
1713
-Dharfbuzz=disabled
1814
-Dtests=disabled
1915
-Dbrotli=enabled

‎packages/fribidi.cmake‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,7 @@ ExternalProject_Add(fribidi
55
GIT_CLONE_POST_COMMAND "sparse-checkout set --no-cone /* !test"
66
UPDATE_COMMAND ""
77
CONFIGURE_COMMAND ${EXEC} CONF=1 meson setup <BINARY_DIR> <SOURCE_DIR>
8-
--prefix=${MINGW_INSTALL_PREFIX}
9-
--libdir=${MINGW_INSTALL_PREFIX}/lib
10-
--cross-file=${MESON_CROSS}
11-
--buildtype=release
12-
--default-library=static
8+
${meson_conf_args}
139
-Dcpp_args='-DFRIBIDI_LIB_STATIC'
1410
-Ddocs=false
1511
-Dbin=false

‎packages/harfbuzz.cmake‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,7 @@ ExternalProject_Add(harfbuzz
1010
GIT_CLONE_POST_COMMAND "sparse-checkout set --no-cone /* !test"
1111
UPDATE_COMMAND ""
1212
CONFIGURE_COMMAND ${EXEC} CONF=1 meson setup <BINARY_DIR> <SOURCE_DIR>
13-
--prefix=${MINGW_INSTALL_PREFIX}
14-
--libdir=${MINGW_INSTALL_PREFIX}/lib
15-
--cross-file=${MESON_CROSS}
16-
--buildtype=release
17-
--default-library=static
13+
${meson_conf_args}
1814
-Dicu=disabled
1915
-Dglib=disabled
2016
-Dgobject=disabled

‎packages/lcms2.cmake‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,7 @@ ExternalProject_Add(lcms2
77
GIT_CLONE_FLAGS "--filter=tree:0"
88
UPDATE_COMMAND ""
99
CONFIGURE_COMMAND ${EXEC} CONF=1 meson setup <BINARY_DIR> <SOURCE_DIR>
10-
--prefix=${MINGW_INSTALL_PREFIX}
11-
--libdir=${MINGW_INSTALL_PREFIX}/lib
12-
--cross-file=${MESON_CROSS}
13-
--buildtype=release
14-
--default-library=static
10+
${meson_conf_args}
1511
-Dfastfloat=true
1612
-Dthreaded=true
1713
BUILD_COMMAND ${EXEC} ninja -C <BINARY_DIR>

‎packages/libass.cmake‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,7 @@ ExternalProject_Add(libass
1111
GIT_CLONE_FLAGS "--filter=tree:0"
1212
UPDATE_COMMAND ""
1313
CONFIGURE_COMMAND ${EXEC} CONF=1 meson setup <BINARY_DIR> <SOURCE_DIR>
14-
--prefix=${MINGW_INSTALL_PREFIX}
15-
--libdir=${MINGW_INSTALL_PREFIX}/lib
16-
--cross-file=${MESON_CROSS}
17-
--buildtype=release
18-
--default-library=static
14+
${meson_conf_args}
1915
-Dfontconfig=enabled
2016
-Ddirectwrite=enabled
2117
-Dasm=enabled

‎packages/libplacebo.cmake‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,7 @@ ExternalProject_Add(libplacebo
2121
COMMAND bash -c "ln -s ${src_glad} <SOURCE_DIR>/3rdparty/glad"
2222
COMMAND bash -c "ln -s ${src_fast_float} <SOURCE_DIR>/3rdparty/fast_float"
2323
COMMAND ${EXEC} CONF=1 meson setup <BINARY_DIR> <SOURCE_DIR>
24-
--prefix=${MINGW_INSTALL_PREFIX}
25-
--libdir=${MINGW_INSTALL_PREFIX}/lib
26-
--cross-file=${MESON_CROSS}
27-
--default-library=static
24+
${meson_conf_args}
2825
-Dd3d11=enabled
2926
-Ddebug=true
3027
-Db_ndebug=true

0 commit comments

Comments
 (0)