Skip to content

Commit

Permalink
Merge branch 'develop', for v0.5.0 release.
Browse files Browse the repository at this point in the history
  • Loading branch information
david-cattermole committed Oct 12, 2024
2 parents 0be5852 + 8250271 commit 78d764e
Show file tree
Hide file tree
Showing 523 changed files with 25,058 additions and 4,160 deletions.
File renamed without changes.
2 changes: 1 addition & 1 deletion .github/workflows/build_and_deploy_docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -r share/requirements-doc.txt
pip install -r share/python_requirements/requirements-github-build-and-deploy-docs.txt
- name: Building Sphinx Documentation
run: |
Expand Down
12 changes: 4 additions & 8 deletions .github/workflows/lint_code.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.7"]
python-version: ["3.9"]
steps:
- uses: actions/checkout@v3

Expand All @@ -19,15 +19,11 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -r share/requirements-dev.txt
pip install -r share/python_requirements/requirements-github-lint-code.txt
- name: Analysing the Python code with flake8 (Hard Error)
- name: Analysing the Python code with ruff (Hard Error)
run: |
./scripts/python_linter_run_flake8_errors_only.bash
- name: Check Python Formatting
run: |
./scripts/python_formatter_run_black_check.bash
./scripts/python_linter_run_ruff.bash
- name: Install Clang-Format
run: |
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#*
*~
*.bak
*.orig
*.pyc
*cppcheck-build-*
cmake-build-*
Expand Down
3 changes: 2 additions & 1 deletion BUILD.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,8 @@ mmSolver v0.4.0 a C++ compiler with at least C++11 is required.
- [Visual Studio 2015 update 3 (MSVC 14.0)](https://visualstudio.microsoft.com/downloads/) (Maya 2018 and 2019)
- [Visual Studio 2017 (MSVC 15.0)](https://visualstudio.microsoft.com/downloads/) (Maya 2020)
- [Visual Studio 2019 (MSVC 16.0)](https://visualstudio.microsoft.com/downloads/) (Maya 2022 and 2023)
- [Visual Studio 2019 (MSVC 19.0)](https://visualstudio.microsoft.com/downloads/) (Maya 2024)
- [Visual Studio 2022 (MSVC 17.0)](https://visualstudio.microsoft.com/downloads/) (Maya 2024)
- [Visual Studio 2022 (MSVC 17.8.3+)](https://visualstudio.microsoft.com/downloads/) (Maya 2025)

## Rust

Expand Down
36 changes: 10 additions & 26 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,38 +33,23 @@ cmake_policy(SET CMP0074 NEW)
# https://cmake.org/cmake/help/latest/policy/CMP0048.html
cmake_policy(SET CMP0048 NEW)

# # Changes how timestamps of downloaded files with
# # ExternalProject_Add() are set.
# #
# # https://cmake.org/cmake/help/latest/policy/CMP0135.html
# cmake_policy(SET CMP0135 NEW)

# Honor visibility properties for all target types.
#
# https://cmake.org/cmake/help/latest/policy/CMP0063.html
cmake_policy(SET CMP0063 NEW)

if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.24.0")
# Changes how timestamps of downloaded files with
# ExternalProject_Add() are set.
#
# https://cmake.org/cmake/help/latest/policy/CMP0135.html
cmake_policy(SET CMP0135 NEW)
endif()

# Do not allow using GNU extensions (such as '-std=g++11'), because
# it's not compatible with Maya.
set(CXX_EXTENSIONS OFF)

# Use the older C++11 ABI for std::string and std::list, to be
# compatible with RHEL/CentOS 7, Maya and the VFX Platform.
#
# https://vfxplatform.com/#footnote-gcc6
#
# TODO: In VFX Platform CY2023, and the move to RHEL 8 or RHEL 9,
# the new default is to use "_GLIBCXX_USE_CXX11_ABI=1".
#
# https://vfxplatform.com/#footnote-gcc9
#
# TODO: Add a flag for use in RHEL 8/9 and Rocky Linux, so we can
# enable/disable.
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GLIBCXX_USE_CXX11_ABI=0")
endif()

# For Windows, allow paths of more than 250 to avoid build issues
# arrising on Windows with very long file paths.
if(NOT DEFINED CMAKE_OBJECT_PATH_MAX)
Expand All @@ -76,11 +61,10 @@ project(mayaMatchMoveSolver)
set(PROJECT_VERSION_MAJOR 0)
set(PROJECT_VERSION_MINOR 5)
set(PROJECT_VERSION_PATCH 0)
set(PROJECT_VERSION_TWEAK beta4)
set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}.${PROJECT_VERSION_TWEAK}")
set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
set(PROJECT_HOMEPAGE_URL "https://github.com/david-cattermole/mayaMatchMoveSolver")
set(PROJECT_DESCRIPTION "Bundle Adjustment solver for MatchMove tasks in Autodesk Maya.")
set(PROJECT_AUTHOR "David Cattermole and others (see AUTHORS.txt file)")
set(PROJECT_AUTHOR "David Cattermole, Patcha Saheb Binginapalli, and others (see AUTHORS.txt file)")
set(PROJECT_COPYRIGHT
"2018-2024, David Cattermole, Anil Reddy, Kazuma Tonegawa, Patcha Saheb Binginapalli.")
enable_testing()
Expand Down
Loading

0 comments on commit 78d764e

Please sign in to comment.