Skip to content

Commit 1c5f016

Browse files
committed
try combining required deps of qt bundled freetype lib for vtk, mac only for now as proof of concept
1 parent 7e82454 commit 1c5f016

File tree

2 files changed

+24
-19
lines changed

2 files changed

+24
-19
lines changed

.github/workflows/release.yml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -37,18 +37,18 @@ jobs:
3737
fail-fast: false
3838
matrix:
3939
include:
40-
- os: "ubuntu-22.04"
41-
shell: "bash"
42-
BOOST_INSTALL_PREFIX: "/opt/smelibs"
43-
BOOST_BOOTSTRAP_OPTIONS: "--with-toolset=clang"
44-
BOOST_B2_OPTIONS: "cxxflags=-fPIC"
45-
TBB_ENABLE_IPO: "ON"
46-
- os: "ubuntu-22.04-arm"
47-
shell: "bash"
48-
BOOST_INSTALL_PREFIX: "/opt/smelibs"
49-
BOOST_BOOTSTRAP_OPTIONS: "--with-toolset=clang"
50-
BOOST_B2_OPTIONS: "cxxflags=-fPIC"
51-
TBB_ENABLE_IPO: "ON"
40+
# - os: "ubuntu-22.04"
41+
# shell: "bash"
42+
# BOOST_INSTALL_PREFIX: "/opt/smelibs"
43+
# BOOST_BOOTSTRAP_OPTIONS: "--with-toolset=clang"
44+
# BOOST_B2_OPTIONS: "cxxflags=-fPIC"
45+
# TBB_ENABLE_IPO: "ON"
46+
# - os: "ubuntu-22.04-arm"
47+
# shell: "bash"
48+
# BOOST_INSTALL_PREFIX: "/opt/smelibs"
49+
# BOOST_BOOTSTRAP_OPTIONS: "--with-toolset=clang"
50+
# BOOST_B2_OPTIONS: "cxxflags=-fPIC"
51+
# TBB_ENABLE_IPO: "ON"
5252
- os: "macos-13"
5353
shell: "bash"
5454
BOOST_INSTALL_PREFIX: "/opt/smelibs"
@@ -61,12 +61,12 @@ jobs:
6161
BOOST_B2_OPTIONS: 'cxxflags="-mmacosx-version-min=11" linkflags="-mmacosx-version-min=11"'
6262
TBB_ENABLE_IPO: "ON"
6363
VTK_OPTIONS: "-DFREETYPE_LIBRARY_RELEASE=/opt/smelibs/lib/libQt6BundledFreetype.a -DFREETYPE_INCLUDE_DIR_freetype2=/opt/smelibs/include/QtFreetype -DFREETYPE_INCLUDE_DIR_ft2build=/opt/smelibs/include/QtFreetype"
64-
- os: "windows-2022"
65-
shell: "msys2 {0}"
66-
BOOST_INSTALL_PREFIX: "C:/smelibs"
67-
BOOST_B2_OPTIONS: "address-model=64"
68-
TBB_ENABLE_IPO: "OFF"
69-
VTK_OPTIONS: "-DFREETYPE_LIBRARY_RELEASE=/c/smelibs/lib/libQt6BundledFreetype.a -DFREETYPE_INCLUDE_DIR_freetype2=/c/smelibs/include/QtFreetype -DFREETYPE_INCLUDE_DIR_ft2build=/c/smelibs/include/QtFreetype"
64+
# - os: "windows-2022"
65+
# shell: "msys2 {0}"
66+
# BOOST_INSTALL_PREFIX: "C:/smelibs"
67+
# BOOST_B2_OPTIONS: "address-model=64"
68+
# TBB_ENABLE_IPO: "OFF"
69+
# VTK_OPTIONS: "-DFREETYPE_LIBRARY_RELEASE=/c/smelibs/lib/libQt6BundledFreetype.a -DFREETYPE_INCLUDE_DIR_freetype2=/c/smelibs/include/QtFreetype -DFREETYPE_INCLUDE_DIR_ft2build=/c/smelibs/include/QtFreetype"
7070
# - os: "windows-11-arm"
7171
# shell: "msys2 {0}"
7272
# BOOST_INSTALL_PREFIX: "C:/smelibs"
@@ -78,7 +78,7 @@ jobs:
7878
shell: ${{ matrix.shell }}
7979
env:
8080
BOOST_INSTALL_PREFIX: ${{ matrix.BOOST_INSTALL_PREFIX }}
81-
BOOST_BOOTSTRAP_OPTIONS: ${{ matrix.BOOST_BOOTSTRAP_OPTIONS }}
81+
# BOOST_BOOTSTRAP_OPTIONS: ${{ matrix.BOOST_BOOTSTRAP_OPTIONS }}
8282
BOOST_B2_OPTIONS: ${{ matrix.BOOST_B2_OPTIONS }}
8383
TBB_ENABLE_IPO: ${{ matrix.TBB_ENABLE_IPO }}
8484
VTK_OPTIONS: ${{ matrix.VTK_OPTIONS }}

build.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -604,6 +604,11 @@ time ninja
604604
${SUDO_CMD} ninja install
605605
cd ../../
606606

607+
# try to combine .a libs on macos only for now
608+
cp /opt/smelibs/lib/libQt6BundledFreetype.a /opt/smelibs/lib/ft.a
609+
libtool -static -o /opt/smelibs/lib/libCombinedFreetype.a /opt/smelibs/lib/libQt6BundledFreetype.a /opt/smelibs/lib/libQt6BundledLibpng.a /opt/smelibs/lib/libz.a
610+
VTK_OPTIONS="-DFREETYPE_LIBRARY_RELEASE=/opt/smelibs/lib/libCombinedFreetype.a -DFREETYPE_INCLUDE_DIR_freetype2=/opt/smelibs/include/QtFreetype -DFREETYPE_INCLUDE_DIR_ft2build=/opt/smelibs/include/QtFreetype"
611+
607612
# build minimal static version of VTK including GUISupportQt and RenderingQt modules
608613
git clone -b $VTK_VERSION --depth 1 https://github.com/Kitware/VTK.git
609614
cd VTK

0 commit comments

Comments
 (0)