mirror of
https://gitlab.com/kelteseth/ScreenPlay.git
synced 2024-11-22 10:42:29 +01:00
Fix cmake argument
x64 argument by vcpkg is x86_64 in cmake... Update to Qt 6.3.1
This commit is contained in:
parent
8953ed7a22
commit
717a182af8
@ -6,7 +6,7 @@ stages:
|
|||||||
|
|
||||||
variables:
|
variables:
|
||||||
GIT_STRATEGY: clone
|
GIT_STRATEGY: clone
|
||||||
QT_VERSION: 6.3.0
|
QT_VERSION: 6.3.1
|
||||||
PYTHON_VERSION: 3.10.1
|
PYTHON_VERSION: 3.10.1
|
||||||
|
|
||||||
check:
|
check:
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
},
|
},
|
||||||
"cacheVariables": {
|
"cacheVariables": {
|
||||||
"CMAKE_BUILD_TYPE": "Debug",
|
"CMAKE_BUILD_TYPE": "Debug",
|
||||||
"CMAKE_PREFIX_PATH": "C:/Qt/6.3.0/msvc2019_64",
|
"CMAKE_PREFIX_PATH": "C:/Qt/6.3.1/msvc2019_64",
|
||||||
"CMAKE_TOOLCHAIN_FILE": "${sourceDir}/../ScreenPlay-vcpkg/scripts/buildsystems/vcpkg.cmake",
|
"CMAKE_TOOLCHAIN_FILE": "${sourceDir}/../ScreenPlay-vcpkg/scripts/buildsystems/vcpkg.cmake",
|
||||||
"VCPKG_TARGET_TRIPLET": "x64-windows"
|
"VCPKG_TARGET_TRIPLET": "x64-windows"
|
||||||
}
|
}
|
||||||
@ -35,7 +35,7 @@
|
|||||||
},
|
},
|
||||||
"cacheVariables": {
|
"cacheVariables": {
|
||||||
"CMAKE_BUILD_TYPE": "Debug",
|
"CMAKE_BUILD_TYPE": "Debug",
|
||||||
"CMAKE_PREFIX_PATH": "~/aqt/6.3.0/gcc_64",
|
"CMAKE_PREFIX_PATH": "~/aqt/6.3.1/gcc_64",
|
||||||
"CMAKE_TOOLCHAIN_FILE": "${sourceDir}/../ScreenPlay-vcpkg/scripts/buildsystems/vcpkg.cmake",
|
"CMAKE_TOOLCHAIN_FILE": "${sourceDir}/../ScreenPlay-vcpkg/scripts/buildsystems/vcpkg.cmake",
|
||||||
"VCPKG_TARGET_TRIPLET": "x64-linux"
|
"VCPKG_TARGET_TRIPLET": "x64-linux"
|
||||||
}
|
}
|
||||||
|
@ -25,7 +25,7 @@ py setup.py
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
5. Open __QtCreator__ and open the settings `Tools -> Options`
|
5. Open __QtCreator__ and open the settings `Tools -> Options`
|
||||||
6. Clone an existing kit like `Qt 6.3.0 MSVC2019 64bit` and add `ScreenPlay` to the new kit name
|
6. Clone an existing kit like `Qt 6.3.1 MSVC2019 64bit` and add `ScreenPlay` to the new kit name
|
||||||
5. Edit CMake variables amd add CMAKE_TOOLCHAIN_FILE and VCPKG_TARGET_TRIPLET
|
5. Edit CMake variables amd add CMAKE_TOOLCHAIN_FILE and VCPKG_TARGET_TRIPLET
|
||||||
* `Kits -> <Your_Kit> -> CMake Configuration`
|
* `Kits -> <Your_Kit> -> CMake Configuration`
|
||||||
|
|
||||||
@ -54,7 +54,7 @@ Append this:
|
|||||||
1. [Download and install Qt binary installer from qt.io](https://www.qt.io/download-qt-installer)
|
1. [Download and install Qt binary installer from qt.io](https://www.qt.io/download-qt-installer)
|
||||||
- Install the Maintaince tool
|
- Install the Maintaince tool
|
||||||
- Select the following features to install:
|
- Select the following features to install:
|
||||||
- Qt 6.3.0
|
- Qt 6.3.1
|
||||||
- MSVC 2019 64-bit
|
- MSVC 2019 64-bit
|
||||||
- **ALL Additional Libraries**
|
- **ALL Additional Libraries**
|
||||||
- Qt Quick 3d
|
- Qt Quick 3d
|
||||||
@ -72,7 +72,7 @@ sudo apt install build-essential git gpg ffmpeg mesa-common-dev libxkbcommon-
|
|||||||
1. [Download and install Qt binary installer from qt.io](https://www.qt.io/download-qt-installer)
|
1. [Download and install Qt binary installer from qt.io](https://www.qt.io/download-qt-installer)
|
||||||
- Install the Maintaince tool
|
- Install the Maintaince tool
|
||||||
- Select the following features to install:
|
- Select the following features to install:
|
||||||
- Qt 6.3.0
|
- Qt 6.3.1
|
||||||
- GCC
|
- GCC
|
||||||
- **ALL Additional Libraries**
|
- **ALL Additional Libraries**
|
||||||
- Qt Quick 3d
|
- Qt Quick 3d
|
||||||
@ -88,7 +88,7 @@ sudo apt install build-essential git gpg ffmpeg mesa-common-dev libxkbcommon-
|
|||||||
```
|
```
|
||||||
pip3 install -U pip
|
pip3 install -U pip
|
||||||
pip3 install aqtinstall
|
pip3 install aqtinstall
|
||||||
aqt install-qt -O ~/aqt linux desktop 6.3.0 gcc_64 -m all
|
aqt install-qt -O ~/aqt linux desktop 6.3.1 gcc_64 -m all
|
||||||
```
|
```
|
||||||
1. Open VSCode and install the `CMake Tools`
|
1. Open VSCode and install the `CMake Tools`
|
||||||
1. ctrl + p: `CMake: Select Configure Preset`
|
1. ctrl + p: `CMake: Select Configure Preset`
|
||||||
@ -110,7 +110,7 @@ export PATH="~/.local/bin:$PATH"
|
|||||||
1. [Download and install Qt binary installer from qt.io](https://www.qt.io/download-qt-installer)
|
1. [Download and install Qt binary installer from qt.io](https://www.qt.io/download-qt-installer)
|
||||||
- Install the Maintaince tool
|
- Install the Maintaince tool
|
||||||
- Select the following features to install:
|
- Select the following features to install:
|
||||||
- Qt 6.3.0
|
- Qt 6.3.1
|
||||||
- Qt WebEngine
|
- Qt WebEngine
|
||||||
- **ALL Additional Libraries**
|
- **ALL Additional Libraries**
|
||||||
- Qt Quick 3d
|
- Qt Quick 3d
|
||||||
@ -122,7 +122,7 @@ export PATH="~/.local/bin:$PATH"
|
|||||||
- Cmake
|
- Cmake
|
||||||
- Ninja
|
- Ninja
|
||||||
1. Change your default kit:
|
1. Change your default kit:
|
||||||
- `QtCreator -> Options -> Kits -> Select your default kit (Desktop Qt 6.3.0) -> Change c and c++ Compiler to Apple Clang (x86_64)`
|
- `QtCreator -> Options -> Kits -> Select your default kit (Desktop Qt 6.3.1) -> Change c and c++ Compiler to Apple Clang (x86_64)`
|
||||||
|
|
||||||
|
|
||||||
# Developer docs
|
# Developer docs
|
||||||
|
@ -107,6 +107,8 @@ def build(
|
|||||||
f"aqt path does not exist at {aqt_path}. Please make sure you have installed aqt.")
|
f"aqt path does not exist at {aqt_path}. Please make sure you have installed aqt.")
|
||||||
exit(2)
|
exit(2)
|
||||||
|
|
||||||
|
|
||||||
|
CMAKE_OSX_ARCHITECTURES: str = ""
|
||||||
deploy_command: str = ""
|
deploy_command: str = ""
|
||||||
executable_file_ending: str = ""
|
executable_file_ending: str = ""
|
||||||
qt_path: str = ""
|
qt_path: str = ""
|
||||||
@ -136,11 +138,14 @@ def build(
|
|||||||
elif platform.system() == "Darwin":
|
elif platform.system() == "Darwin":
|
||||||
if(build_architecture == "arm64"):
|
if(build_architecture == "arm64"):
|
||||||
cmake_target_triplet = "arm64-osx"
|
cmake_target_triplet = "arm64-osx"
|
||||||
|
CMAKE_OSX_ARCHITECTURES = "-DCMAKE_OSX_ARCHITECTURES=arm64"
|
||||||
elif(build_architecture == "x64"):
|
elif(build_architecture == "x64"):
|
||||||
cmake_target_triplet = "x64-osx"
|
cmake_target_triplet = "x64-osx"
|
||||||
|
CMAKE_OSX_ARCHITECTURES = "-DCMAKE_OSX_ARCHITECTURES=x86_64"
|
||||||
else:
|
else:
|
||||||
print("MISSING BUILD ARCH: SET arm64 or x64")
|
print("MISSING BUILD ARCH: SET arm64 or x64")
|
||||||
exit(1)
|
exit(1)
|
||||||
|
|
||||||
qt_path = aqt_path if use_aqt else Path("~/Qt/")
|
qt_path = aqt_path if use_aqt else Path("~/Qt/")
|
||||||
qt_bin_path = aqt_path.joinpath(
|
qt_bin_path = aqt_path.joinpath(
|
||||||
f"{qt_version}/macos") if use_aqt else Path(f"~/Qt/{qt_version}/macos")
|
f"{qt_version}/macos") if use_aqt else Path(f"~/Qt/{qt_version}/macos")
|
||||||
@ -191,11 +196,6 @@ def build(
|
|||||||
f"build-{cmake_target_triplet}-{build_type}")
|
f"build-{cmake_target_triplet}-{build_type}")
|
||||||
clean_build_dir(build_folder)
|
clean_build_dir(build_folder)
|
||||||
|
|
||||||
CMAKE_OSX_ARCHITECTURES: str = ""
|
|
||||||
# The entire parameter should be optional. We need this to explicity build
|
|
||||||
# x84 and arm version seperat, only because we cannot compile two at once with vcpkg
|
|
||||||
if build_architecture:
|
|
||||||
CMAKE_OSX_ARCHITECTURES = f"-DCMAKE_OSX_ARCHITECTURES={build_architecture}"
|
|
||||||
|
|
||||||
cmake_configure_command = f'cmake ../ \
|
cmake_configure_command = f'cmake ../ \
|
||||||
{CMAKE_OSX_ARCHITECTURES} \
|
{CMAKE_OSX_ARCHITECTURES} \
|
||||||
@ -379,7 +379,7 @@ if __name__ == "__main__":
|
|||||||
help="Sets the build architecture. Used to build x86 and ARM osx versions. Currently only works with x86_64 and arm64")
|
help="Sets the build architecture. Used to build x86 and ARM osx versions. Currently only works with x86_64 and arm64")
|
||||||
args = parser.parse_args()
|
args = parser.parse_args()
|
||||||
|
|
||||||
qt_version = "6.3.0"
|
qt_version = "6.3.1"
|
||||||
qt_ifw_version = "4.4" # Not yet used.
|
qt_ifw_version = "4.4" # Not yet used.
|
||||||
qt_version_overwrite = ""
|
qt_version_overwrite = ""
|
||||||
use_aqt = False
|
use_aqt = False
|
||||||
|
Loading…
Reference in New Issue
Block a user