Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rebuild for vtk930 and migrate from qt-main (qt5) to qt6-main #65

Merged
merged 6 commits into from
Jun 23, 2024
Merged

Rebuild for vtk930 and migrate from qt-main (qt5) to qt6-main #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
065afdf
Rebuild for vtk930
regro-cf-autotick-bot Jun 19, 2024
8b28ec7
MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.2, and co…
regro-cf-autotick-bot Jun 19, 2024
a14344e
Explicitly link against qt5 to avoid accindetally linking qt6
traversaro Jun 19, 2024
172f65e
Delete recipe/conda_build_config.yaml
traversaro Jun 19, 2024
f65dc89
Build against qt6
traversaro Jun 19, 2024
96c7408
Update build.sh
traversaro Jun 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ci_support/linux_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ qt_main:
target_platform:
- linux-64
vtk:
- 9.2.6
- 9.3.0
zip_keys:
- - c_stdlib_version
- cdt_name
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ qt_main:
target_platform:
- linux-aarch64
vtk:
- 9.2.6
- 9.3.0
zip_keys:
- - c_stdlib_version
- cdt_name
2 changes: 1 addition & 1 deletion .ci_support/linux_ppc64le_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ pin_run_as_build:
target_platform:
- linux-ppc64le
vtk:
- 9.2.6
- 9.3.0
zip_keys:
- - c_stdlib_version
- cdt_name
10 changes: 0 additions & 10 deletions .ci_support/migrations/boost1840.yaml
View file
Open in desktop

This file was deleted.

7 changes: 7 additions & 0 deletions .ci_support/migrations/vtk930.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
__migrator:
build_number: 1
kind: version
migration_number: 1
migrator_ts: 1718606940.144743
vtk:
- 9.3.0
8 changes: 4 additions & 4 deletions .ci_support/osx_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.12'
- '10.13'
MACOSX_SDK_VERSION:
- '10.12'
- '10.13'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '10.12'
- '10.13'
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -32,4 +32,4 @@ qt_main:
target_platform:
- osx-64
vtk:
- 9.2.6
- 9.3.0
4 changes: 3 additions & 1 deletion .ci_support/osx_arm64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
MACOSX_SDK_VERSION:
- '11.0'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
Expand Down Expand Up @@ -30,4 +32,4 @@ qt_main:
target_platform:
- osx-arm64
vtk:
- 9.2.6
- 9.3.0
2 changes: 1 addition & 1 deletion .ci_support/win_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ qt_main:
target_platform:
- win-64
vtk:
- 9.2.6
- 9.3.0
4 changes: 2 additions & 2 deletions .gitattributes
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .scripts/build_steps.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .scripts/run_osx_build.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions .scripts/run_win_build.bat
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 10 additions & 1 deletion recipe/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,20 @@
set -ex

if [[ "$target_platform" != "linux-ppc64le" ]]; then
QT_SUPPORT=ON
QT_SUPPORT=QT6
else
QT_SUPPORT=OFF
fi

if [[ "$build_platform" != "$target_platform" ]]; then
export QT_HOST_PATH="$BUILD_PREFIX"
fi

if [[ "${target_platform}" == "osx-64" ]]; then
# https://conda-forge.org/docs/maintainer/knowledge_base.html#newer-c-features-with-old-sdk
export CXXFLAGS="${CXXFLAGS} -D_LIBCPP_DISABLE_AVAILABILITY"
fi

mkdir build && cd build

cmake ${CMAKE_ARGS} \
Expand Down
5 changes: 0 additions & 5 deletions recipe/conda_build_config.yaml
View file
Open in desktop

This file was deleted.

5 changes: 3 additions & 2 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ source:
sha256: {{ sha256 }}

build:
number: 0
number: 1
run_exports:
- {{ pin_subpackage('pcl', max_pin='x.x.x') }}

Expand All @@ -32,6 +32,7 @@ requirements:
- ninja # [win]
- make # [unix]
- pkgconfig
- qt6-main # [build_platform != target_platform and not ppc64le]
host:
- xorg-libxfixes # [linux]
- flann
Expand All @@ -41,7 +42,7 @@ requirements:
- vtk
- libpng
- glew
- qt-main # [not ppc64le]
- qt6-main # [not ppc64le]
run:
- flann
- qhull
Expand Down