tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[cmake] Use MLN prefix instead of MBGL (#1054)

Browse Source 
Co-authored-by: Bart Louwers <bart@emeel.net>
This commit is contained in:
Tadej Novak
2023-04-28 00:34:38 +02:00
committed by GitHub
parent e4501c789d
commit 95c7e3818d
43 changed files with 247 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.github/actions/qt5-build/entrypoint.sh vendored
View File

@@ -15,8 +15,8 @@ cmake ../source/ \
-DCMAKE_C_COMPILER_LAUNCHER="ccache" \
-DCMAKE_CXX_COMPILER_LAUNCHER="ccache" \
-DCMAKE_INSTALL_PREFIX=../install \
-DMBGL_WITH_QT=ON \
-DMBGL_QT_DEPLOYMENT=ON \
-DMBGL_QT_LIBRARY_ONLY=ON
-DMLN_WITH_QT=ON \
-DMLN_QT_DEPLOYMENT=ON \
-DMLN_QT_LIBRARY_ONLY=ON
ninja
ninja install

6
.github/actions/qt6-build/entrypoint.sh vendored
View File

@@ -13,9 +13,9 @@ qt-cmake ../source/ \
-DCMAKE_C_COMPILER_LAUNCHER="ccache" \
-DCMAKE_CXX_COMPILER_LAUNCHER="ccache" \
-DCMAKE_INSTALL_PREFIX=../install \
-DMBGL_WITH_QT=ON \
-DMBGL_QT_DEPLOYMENT=ON \
-DMBGL_QT_LIBRARY_ONLY=ON
-DMLN_WITH_QT=ON \
-DMLN_QT_DEPLOYMENT=ON \
-DMLN_QT_LIBRARY_ONLY=ON
ninja
ninja install
cd ../install

2
.github/workflows/android-ci-pull.yml vendored
View File

@@ -37,7 +37,7 @@ jobs:
JOBS: 8
BUILDTYPE: Debug
IS_LOCAL_DEVELOPMENT: false
MBGL_ANDROID_STL: c++_static
MLN_ANDROID_STL: c++_static
steps:
- uses: actions/checkout@v3

2
.github/workflows/android-ci.yml vendored
View File

@@ -34,7 +34,7 @@ jobs:
JOBS: 8
BUILDTYPE: Debug
IS_LOCAL_DEVELOPMENT: false
MBGL_ANDROID_STL: c++_static
MLN_ANDROID_STL: c++_static
steps:
- uses: actions/checkout@v3

2
.github/workflows/linux-ci.yml vendored
View File

@@ -48,7 +48,7 @@ jobs:
- name: Build Maplibre GL Core
run: |
cmake --version
cmake -B build -GNinja -DCMAKE_BUILD_TYPE=Debug -DMBGL_WITH_CLANG_TIDY=ON -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DMBGL_WITH_COVERAGE=ON
cmake -B build -GNinja -DCMAKE_BUILD_TYPE=Debug -DMLN_WITH_CLANG_TIDY=ON -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DMLN_WITH_COVERAGE=ON
cmake --build build --target mbgl-core mbgl-test-runner mbgl-render-test-runner
- name: Archive mbgl-test-runner

12
.github/workflows/qt-ci.yml vendored
View File

@@ -194,9 +194,9 @@ jobs:
-DCMAKE_INSTALL_PREFIX="../install" \
-DCMAKE_OSX_DEPLOYMENT_TARGET="${DEPLOYMENT_TARGET}" \
-DCMAKE_OSX_ARCHITECTURES="${DEPLOYMENT_ARCH}" \
-DMBGL_WITH_QT=ON \
-DMBGL_QT_DEPLOYMENT=ON \
-DMBGL_QT_LIBRARY_ONLY=ON
-DMLN_WITH_QT=ON \
-DMLN_QT_DEPLOYMENT=ON \
-DMLN_QT_LIBRARY_ONLY=ON
ninja
ninja install
@@ -221,9 +221,9 @@ jobs:
-DCMAKE_C_COMPILER_LAUNCHER="ccache.exe" \
-DCMAKE_CXX_COMPILER_LAUNCHER="ccache.exe" \
-DCMAKE_INSTALL_PREFIX="../install" \
-DMBGL_WITH_QT=ON \
-DMBGL_QT_DEPLOYMENT=ON \
-DMBGL_QT_LIBRARY_ONLY=ON
-DMLN_WITH_QT=ON \
-DMLN_QT_DEPLOYMENT=ON \
-DMLN_QT_LIBRARY_ONLY=ON
ninja.exe
ninja.exe install