Skip to content

Conversation

@oitel
Copy link
Contributor

@oitel oitel commented Feb 21, 2025

No description provided.

@oitel oitel added full-ci run all steps skip-image-rebuild force to skip docker image rebuild labels Feb 21, 2025
@oitel oitel removed the skip-image-rebuild force to skip docker image rebuild label Feb 21, 2025
@oitel oitel added skip-image-rebuild force to skip docker image rebuild disable-build-emscripten labels Feb 21, 2025
@oitel oitel added skip-image-rebuild force to skip docker image rebuild and removed full-ci run all steps labels Feb 23, 2025
@oitel oitel changed the title WIP: Add vcpkg support on Linux Fix vcpkg build on Linux Feb 25, 2025
@oitel oitel marked this pull request as ready for review February 25, 2025 16:05
@oitel oitel changed the title Fix vcpkg build on Linux Add initial vcpkg support on Linux Feb 26, 2025
Comment on lines 104 to 128
IF(MESHLIB_PYTHON_SUPPORT AND NOT MR_EMSCRIPTEN)
# TODO: drop Python version hard-coding; set -DMESHLIB_PYTHON_VERSION explicitly in the CI config if needed
IF(APPLE)
set(MESHLIB_PYTHON_VERSION "3.10")
ELSEIF(DEFINED MR_LINUX_DISTRO)
IF(${MR_LINUX_DISTRO} STREQUAL "Ubuntu")
set(MESHLIB_PYTHON_VERSION "3.8")
IF(${MR_PLATFORM} STREQUAL "Ubuntu_22")
set(MESHLIB_PYTHON_VERSION "3.10")
ELSEIF(${MR_PLATFORM} STREQUAL "Ubuntu_24")
set(MESHLIB_PYTHON_VERSION "3.12")
ENDIF()
ELSEIF(${MR_LINUX_DISTRO} STREQUAL "Fedora")
set(MESHLIB_PYTHON_VERSION "3.11")
IF(${MR_PLATFORM} STREQUAL "Fedora_39")
set(MESHLIB_PYTHON_VERSION "3.12")
IF(NOT DEFINED MESHLIB_PYTHON_VERSION)
# TODO: drop Python version hard-coding; set -DMESHLIB_PYTHON_VERSION explicitly in the CI config if needed
IF(APPLE)
set(MESHLIB_PYTHON_VERSION "3.10")
ELSEIF(DEFINED MR_LINUX_DISTRO)
IF(${MR_LINUX_DISTRO} STREQUAL "Ubuntu")
set(MESHLIB_PYTHON_VERSION "3.8")
IF(${MR_PLATFORM} STREQUAL "Ubuntu_22")
set(MESHLIB_PYTHON_VERSION "3.10")
ELSEIF(${MR_PLATFORM} STREQUAL "Ubuntu_24")
set(MESHLIB_PYTHON_VERSION "3.12")
ENDIF()
ELSEIF(${MR_LINUX_DISTRO} STREQUAL "Fedora")
set(MESHLIB_PYTHON_VERSION "3.11")
IF(${MR_PLATFORM} STREQUAL "Fedora_39")
set(MESHLIB_PYTHON_VERSION "3.12")
ENDIF()
ENDIF()
ENDIF()
ENDIF()

IF($ENV{MESHLIB_PYTHON_VERSION})
set(MESHLIB_PYTHON_VERSION $ENV{MESHLIB_PYTHON_VERSION})
IF($ENV{MESHLIB_PYTHON_VERSION})
set(MESHLIB_PYTHON_VERSION $ENV{MESHLIB_PYTHON_VERSION})
ENDIF()
ENDIF()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should it be in compiler options, or other helper file?

@oitel oitel merged commit 642df5f into master Feb 27, 2025
59 checks passed
@oitel oitel deleted the feature/vcpkg_linux branch February 27, 2025 14:50
Fedr added a commit that referenced this pull request Mar 5, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

skip-image-rebuild force to skip docker image rebuild

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants