Skip to content

Commit d824554

Browse files
sandman7920justinclift
sandman7920
authored and
justinclift
committed
Adding Qt6 support
1 parent 65c471b commit d824554

File tree

413 files changed

+73982
-6029
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

413 files changed

+73982
-6029
lines changed

‎.github/workflows/build-macos.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,20 +43,20 @@ jobs:
4343
run: |
4444
if [ "${{ inputs.NIGHTLY }}" = "true" ]; then
4545
if [ "${{ matrix.sqlcipher }}" = "1" ]; then
46-
sed -i "" 's/"DB Browser for SQLite"/"DB Browser for SQLCipher Nightly"/' CMakeLists.txt
46+
sed -i "" 's/"DB Browser for SQLite"/"DB Browser for SQLCipher Nightly"/' config/platform_apple.cmake
4747
else
48-
sed -i "" 's/"DB Browser for SQLite"/"DB Browser for SQLite Nightly"/' CMakeLists.txt
48+
sed -i "" 's/"DB Browser for SQLite"/"DB Browser for SQLite Nightly"/' config/platform_apple.cmake
4949
fi
5050
else
5151
if [ "${{ matrix.sqlcipher }}" = "1" ]; then
52-
sed -i "" 's/"DB Browser for SQLite"/"DB Browser for SQLCipher-dev-'$(git rev-parse --short --verify HEAD)'"/' CMakeLists.txt
52+
sed -i "" 's/"DB Browser for SQLite"/"DB Browser for SQLCipher-dev-'$(git rev-parse --short --verify HEAD)'"/' config/platform_apple.cmake
5353
else
54-
sed -i "" 's/"DB Browser for SQLite"/"DB Browser for SQLite-dev-'$(git rev-parse --short --verify HEAD)'"/' CMakeLists.txt
54+
sed -i "" 's/"DB Browser for SQLite"/"DB Browser for SQLite-dev-'$(git rev-parse --short --verify HEAD)'"/' config/platform_apple.cmake
5555
fi
5656
fi
5757
5858
mkdir build && cd build
59-
cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" -DcustomTap=1 -DENABLE_TESTING=ON -Dsqlcipher=${{ matrix.sqlcipher }} ..
59+
cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_STANDARD=14 -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" -DcustomTap=1 -DENABLE_TESTING=ON -Dsqlcipher=${{ matrix.sqlcipher }} ..
6060
6161
- name: Build
6262
working-directory: ./build

‎.github/workflows/build-windows.yml

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ jobs:
3232
choco install openssl --version=${{ env.OPENSSL_VERSION}}
3333
}
3434
35+
- name: Install Ninja (Windows)
36+
run: choco install -y --no-progress ninja
37+
3538
# When building SQLCipher, if we specify a path to OpenSSL and
3639
# there are spaces in the path, an error will occur, so to
3740
# avoid this, create the symlink.
@@ -107,9 +110,8 @@ jobs:
107110
mkdir sqlcipher
108111
copy sqlite3.h sqlcipher
109112
110-
- name: Patch CMakeLists.txt and WiX Toolset Variables
113+
- name: Patch WiX Toolset Variables
111114
run: |
112-
git apply .github\patch\CMakeLists.txt.patch
113115
git apply .github\patch\product.wxs.patch
114116
git apply .github\patch\translations.wxs.patch
115117
git apply .github\patch\variables.wxi.patch
@@ -118,28 +120,29 @@ jobs:
118120
run: |
119121
mkdir release-sqlite && cd release-sqlite
120122
if ("${{ matrix.arch }}" -eq "Win32") {
121-
cmake -G "Visual Studio 16 2019" -A "Win32" -DCMAKE_BUILD_TYPE=Release ..\
123+
cmake -G"Ninja Multi-Config" -DCMAKE_PREFIX_PATH="C:/dev/SQLite-Win32;C:/dev/OpenSSL-Win32" ..\
122124
} else {
123-
cmake -G "Visual Studio 16 2019" ..\
125+
cmake -G"Ninja Multi-Config" -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="C:/dev/SQLite-Win64;C:/dev/OpenSSL-Win64" ..\
124126
}
125127
126128
- name: Build (SQLite)
127-
run: cd release-sqlite && devenv /Build Release sqlitebrowser.sln /Project ALL_BUILD
129+
run: |
130+
cd release-sqlite
131+
cmake --build . --config Release
128132
129133
- name: Configure build (SQLCipher)
130134
run: |
131135
mkdir release-sqlcipher && cd release-sqlcipher
132136
if ("${{ matrix.arch }}" -eq "Win32") {
133-
cmake -G "Visual Studio 16 2019" -DCMAKE_BUILD_TYPE=Release -Dsqlcipher=1 -A "Win32" ..\
137+
cmake -G"Ninja Multi-Config" -Dsqlcipher=1 -DCMAKE_PREFIX_PATH="C:/dev/SQLCipher-Win32;C:/dev/OpenSSL-Win32" ..\
134138
} else {
135-
cmake -G "Visual Studio 16 2019" -DCMAKE_BUILD_TYPE=Release -Dsqlcipher=1 ..\
139+
cmake -G"Ninja Multi-Config" -Dsqlcipher=1 -DCMAKE_PREFIX_PATH="C:/dev/SQLCipher-Win64;C:/dev/OpenSSL-Win64" ..\
136140
}
137141
138142
- name: Build (SQLCipher)
139143
run: |
140144
cd release-sqlcipher
141-
devenv /Build Release sqlitebrowser.sln /Project ALL_BUILD
142-
mv "Release\DB Browser for SQLite.exe" "Release\DB Browser for SQLCipher.exe"
145+
cmake --build . --config Release
143146
144147
- if: github.event_name != 'pull_request'
145148
name: Create MSI

0 commit comments

Comments
 (0)