Skip to content

Commit a87e54a

Browse files
committed
Fix global version, tweak build docs
1 parent 2ea6c1c commit a87e54a

File tree

6 files changed

+20
-6
lines changed

6 files changed

+20
-6
lines changed

CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cmake_minimum_required(VERSION 3.26 FATAL_ERROR)
22
cmake_policy(VERSION 3.26)
33

4-
set(XSTUDIO_GLOBAL_VERSION "2.5.0" CACHE STRING "Version string")
4+
set(XSTUDIO_GLOBAL_VERSION "1.0.0" CACHE STRING "Version string")
55
set(XSTUDIO_GLOBAL_NAME xStudio)
66

77
set(CMAKE_OSX_DEPLOYMENT_TARGET "14.5" CACHE STRING "Minimum OS X deployment version" FORCE)
@@ -298,9 +298,9 @@ if (WIN32)
298298

299299
include(InstallRequiredSystemLibraries)
300300

301-
set(CPACK_PACKAGE_VERSION "2.5.0")
302-
set(CPACK_PACKAGE_VERSION_MAJOR "2")
303-
set(CPACK_PACKAGE_VERSION_MINOR "5")
301+
set(CPACK_PACKAGE_VERSION "1.0.0")
302+
set(CPACK_PACKAGE_VERSION_MAJOR "1")
303+
set(CPACK_PACKAGE_VERSION_MINOR "0")
304304
set(CPACK_PACKAGE_VERSION_PATCH "0")
305305
set(CPACK_PACKAGE_VENDOR "DNEG / Academy Software Foundation")
306306
set (CPACK_NSIS_MUI_ICON

docs/build_guides/centos_7.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@
33
[Download](https://www.centos.org/download/ "Download")
44
**Default Mesa drivers will not work, as they are to old, NVidia/AMD/Intel custom drivers should be fine.
55
**
6+
7+
### Note (May 2025)
8+
9+
These docs are not accurate and are to be updated soon. Note that xSTUDIO now requires Qt6.5.3, where these notes incorrectly install qt5. You can install Qt6.5.3 using [these instructions](downloading_qt.md) instead.
10+
611
### Distro installs
712
sudo yum install -y centos-release-scl
813
sudo yum install -y devtoolset-9

docs/build_guides/downloading_qt.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Now you must select the correct version of Qt to download. The required version
1616

1717
* Apple: **macOS**
1818
* Windows: **MSVC 2019 64-bit**
19-
* Linux:
19+
* Linux: **gcc_64**
2020

2121
You must also expand the 'Addition Libraries' item, and select **'Qt Image Formats'** from that list.
2222

docs/build_guides/linux_generic.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ You must run these commands to add the OpenTimelineIO submodule to the tree
3232

3333
### Modify the CMakePresets.json file
3434

35-
Open the CMakePresets.json file (which is in the root of the xstudio repo) in a text editor. You must look for the entry "Qt6_DIR" and modify the value that follows it to point to your installation of the Qt SDK. Specifically, you need to point to a directory named 'Qt6' which is in a directory named 'cmake', which is in a directory named 'lib'. For example, on MacOS where user Mary Jane downloaded Qt into her home folder the entry should look like this:
35+
Open the CMakePresets.json file (which is in the root of the xstudio repo) in a text editor. You must look for the entry "Qt6_DIR" and modify the value that follows it to point to your installation of the Qt SDK. Specifically, you need to point to a directory named 'Qt6' which is in a directory named 'cmake', which is in a directory named 'lib'. For example, if user Mary Jane downloaded Qt into her home folder the entry should look like this:
3636

3737
"Qt6_DIR": "/home/maryjane/Qt/6.5.3/gcc_64/lib/cmake/Qt6",
3838

docs/build_guides/rocky_linux_9_1.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
## Rocky Linux 9.1
22
[Download](https://rockylinux.org/download "Download")
33

4+
### Note (May 2025)
5+
6+
These docs are not accurate and are to be updated soon. Note that xSTUDIO now requires Qt6.5.3, where these notes incorrectly install qt5. You can install Qt6.5.3 using [these instructions](downloading_qt.md) instead.
7+
48
### Distro installs
59
sudo dnf config-manager --set-enabled crb
610
sudo dnf update

docs/build_guides/ubuntu_22_04.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
## Ubuntu 22.04 LTS
22
[Download](https://releases.ubuntu.com/22.04 "Download")
33

4+
### Note (May 2025)
5+
6+
These docs are not accurate and are to be updated soon. Note that xSTUDIO now requires Qt6.5.3, where these notes incorrectly install qt5. You can install Qt6.5.3 using [these instructions](downloading_qt.md) instead.
7+
8+
49
### Distro installs
510
sudo apt install build-essential cmake git python3-pip
611
sudo apt install doxygen sphinx-common sphinx-rtd-theme-common python3-breathe

0 commit comments

Comments
 (0)