Skip to content

Commit

Permalink
Qt6 feature branch - Various fix for all platforms and VFX 2024 CI (E…
Browse files Browse the repository at this point in the history
…xcept Windows) (AcademySoftwareFoundation#618)

(Except Windows)

Here's are the changes:

- Added VFX 2024 CI (except for Windows) without ci-openrv from
aswf-docker for now (Linux only, not tested yet)
- Code changes to fix issues on Windows
- Code changes to fix issues on MacOS
- Added OpenSSL 3 for VFX2024
- Added some logic to all `.wrapper` to detect which VFX platform is
active (using Python version) and then use the right OpenSSL version.
- FIx issue with Python not finding Tkinter on MacOS. The issue was with
VFX2024, but the fix make sense for VFX2023 too.

**There are a lot of reformatting because of the pre-commit hook.
Windows is not included in the VFX 2024 CI because of issues with
PySide6 in the CI.**

- [x] Rocky linux 8/9
- [x] MacOS
- [ ] Windows (partial, can compile with my windows, but not in CI
because of pyside6 issue)

---------

Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
  • Loading branch information
cedrik-fuoco-adsk committed Nov 28, 2024
1 parent 50e1997 commit b7e0f5c
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 8 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,8 @@ jobs:
# icu4c is needed for Qt UIC executable / AUTOUIC.
# Might be to find another way to install icu4c if the icu4c recipe disappear.
run: |
brew install --quiet --formula cmake ninja readline sqlite3 xz zlib tcl-tk autoconf automake libtool python yasm clang-format black meson nasm pkg-config glew icu4c
brew install --formula cmake ninja readline sqlite3 xz zlib tcl-tk python-tk autoconf automake libtool python yasm clang-format black meson nasm pkg-config glew
brew install --formula icu4c@74
- name: Set QT_HOME
if: matrix.arch-type == 'x86_64' && matrix.vfx-platform == 'CY2023'
Expand Down
14 changes: 8 additions & 6 deletions cmake/defaults/cxx_defaults.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -110,14 +110,16 @@ ENDIF()
# FFmpeg option
#

# Add preprocessor variable for use in code and
# cmake to determine the current version of FFmpeg.
# Current version must be one of the supported
# versions, as defined in ffmpeg.cmake.
# Add preprocessor variable for use in code and cmake to determine the current version of FFmpeg. Current version must be one of the supported versions, as
# defined in ffmpeg.cmake.
IF(RV_FFMPEG STREQUAL 6)
SET(RV_FFMPEG_6 ON)
SET(RV_FFMPEG_6
ON
)
ADD_COMPILE_DEFINITIONS(RV_FFMPEG_6)
ELSEIF(RV_FFMPEG STREQUAL 7)
SET(RV_FFMPEG_7 ON)
SET(RV_FFMPEG_7
ON
)
ADD_COMPILE_DEFINITIONS(RV_FFMPEG_7)
ENDIF()
1 change: 0 additions & 1 deletion cmake/dependencies/python3.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
# SPDX-License-Identifier: Apache-2.0
#


SET(_python3_target
"RV_DEPS_PYTHON3"
)
Expand Down

0 comments on commit b7e0f5c

Please sign in to comment.