Skip to content

Simplify build system and add python as dependency #407

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

Draft
wants to merge 6 commits into
base: master
Choose a base branch
from
Draft

Simplify build system and add python as dependency #407

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
41a8ddb
COMP: SuperBuild: Support explicit overriding of QT_MIN_VERSION
jcfr Feb 3, 2022
3174523
COMP: Simplify build-system removing TRAVIS_BUILD option
jcfr Feb 3, 2022
bb26091
COMP: Remove irrelevant Travis CI pipeline
jcfr Mar 10, 2023
59d84b8
COMP: Use latest version checkout, install-qt-action and upload-artif…
jcfr Mar 10, 2023
45be287
COMP: Cancel in-progress GitHub Actions worklows on repeated pushes
jcfr Mar 10, 2023
cb23254
COMP: Update GitHub Actions pipelines standardize on building against…
jcfr Mar 10, 2023
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
9 changes: 6 additions & 3 deletions .github/workflows/linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-18.04, ubuntu-latest]
os: [ubuntu-20.04]

steps:
- name: Checkout
Expand All @@ -24,11 +24,14 @@ jobs:
- name: Install Qt
uses: jurplel/install-qt-action@v3
with:
version: 5.14.2
version: 5.15.2
target: desktop
host: linux
install-deps: true

- name: Build
run: ./build.sh -DQt5_PATH="${Qt5_Dir}" -j3
run: |
./build.sh \
-DQt5_PATH="${Qt5_Dir}" \
-j3
continue-on-error: true
14 changes: 8 additions & 6 deletions .github/workflows/mac.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ concurrency:
jobs:
mac-build-gui:

runs-on: macOS-latest
runs-on: macos-10.15

steps:
- name: Checkout
Expand All @@ -18,17 +18,19 @@ jobs:
- name: Install Qt
uses: jurplel/install-qt-action@v3
with:
version: 5.14.2
version: 5.15.2
target: desktop
host: mac
install-deps: true

- name: Prepare
run: |
ln -s /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk/System/Library/Frameworks/Tk.framework/Versions/8.5/Headers/X11/ /usr/local/include/X11
#- name: Prepare
# run: |
# ln -s /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk/System/Library/Frameworks/Tk.framework/Versions/8.5/Headers/X11/ /usr/local/include/X11

- name: make
run: ./build.sh -DQt5_PATH="${Qt5_Dir}"
run: |
./build.sh \
-DQt5_PATH="${Qt5_Dir}"

- name: Package
working-directory: bin/Seg3D
Expand Down
21 changes: 17 additions & 4 deletions .github/workflows/windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,14 @@ jobs:
windows-build-gui:
strategy:
matrix:
qtversion: [5.12.8, 5.14.2]
runs-on: windows-2016
qtversion: [5.15.2]
include:
- qtversion: 5.15.2
qtarch: win64_msvc2019_64
cmake-generator: "Visual Studio 17 2022"
Copy link
Member

@dcwhite dcwhite Mar 15, 2023

Choose a reason for hiding this comment

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

I think this will require updating the Boost dependency to something newer, and possibly python as well. It might break a lot of code. I have SCIRun building with Boost 1.75, but that version is also too old for VS 2022.

cmake-arch: x64
cmake-toolset: v143
runs-on: windows-2022

steps:

Expand All @@ -25,13 +31,20 @@ jobs:
version: ${{ matrix.qtversion }}
target: desktop
host: windows
arch: win64_msvc2017_64
arch: ${{ matrix.qtarch }}
install-deps: true

- name: Configure
working-directory: bin
run: |
cmake ..\Superbuild -DCMAKE_BUILD_TYPE=Release -G"Visual Studio 15 2017" -Ax64 -DQt5_PATH:PATH="$env:Qt5_Dir" -DBUILD_WITH_PYTHON:BOOL=OFF
cmake `
..\Superbuild `
-DCMAKE_BUILD_TYPE=Release `
-G"${{ matrix.cmake-generator }}" `
-A${{ matrix.cmake-arch }} `
-T${{ matrix.cmake-toolset }} `
-DQt5_PATH:PATH="$env:Qt5_Dir" `
-DBUILD_WITH_PYTHON:BOOL=OFF

- name: Compile
working-directory: bin
Expand Down