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

CI: Test vcpkg PR #2

Merged
merged 17 commits into from
Apr 23, 2024
Merged

CI: Test vcpkg PR #2

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
ed16b93
CI: Test vcpkg PR
ResearchDaniel Apr 29, 2022
4075efd
repo fix
ResearchDaniel Apr 29, 2022
a2c3751
branch name
ResearchDaniel Apr 29, 2022
df5e01a
Merge branch 'master' into fix/test-vcpkg
ResearchDaniel Mar 13, 2024
a97638c
Disable Python in CMakePresets.json
ResearchDaniel Mar 21, 2024
b09b9c3
Update to inviwo commit 1abb2b923c51d684af8b6205c3b3e8ece2f86c6a
ResearchDaniel Mar 27, 2024
a547adb
Fix uppdated include path for inviwocommondefines.h
ResearchDaniel Mar 30, 2024
2075bcd
Fix packaging setup CMakePresets.json
ResearchDaniel Mar 30, 2024
f0b8764
Fix cmake linkage in visualneuro.yml
ResearchDaniel Apr 10, 2024
1e11187
Update visualneuro.yml
ResearchDaniel Apr 10, 2024
f26bb46
CMake: Let VisualNeuro settings override others
ResearchDaniel Apr 22, 2024
7acee19
Github actions: Use Inviwo commit 1abb2b923c51d684af8b6205c3b3e8ece2f…
ResearchDaniel Apr 22, 2024
2ea25b5
MacOS 13 packaging fix
ResearchDaniel Apr 23, 2024
094fb95
Mac packaging test
ResearchDaniel Apr 23, 2024
f1d8c02
Update packaging.cmake
ResearchDaniel Apr 23, 2024
6891cc2
Packaging test
ResearchDaniel Apr 23, 2024
8fbb5c3
Packaging test
ResearchDaniel Apr 23, 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
8 changes: 8 additions & 0 deletions apps/visualneuro/packaging/packaging.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,14 @@ set(CMAKE_INSTALL_OPENMP_LIBRARIES TRUE)
set(CMAKE_INSTALL_SYSTEM_RUNTIME_COMPONENT Application)
include (InstallRequiredSystemLibraries)

if(APPLE)
# Fix for CPack Error on MacOS 13
# Error generating temporary disk image.
# hdiutil: create failed - Resource busy
# https://github.com/actions/runner-images/issues/7522#issuecomment-1564467252
set(CPACK_COMMAND_HDIUTIL "/usr/bin/sudo /usr/bin/hdiutil")
Copy link

Choose a reason for hiding this comment

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

Nice, we might need that one in inviwo too... I thought the runner just ran out of space I think...

endif()

set(CPACK_PACKAGE_NAME "Visual Neuro")
set(CPACK_PACKAGE_CONTACT "Daniel Jönsson <info@visualneuro.com>")
set(CPACK_PACKAGE_VENDOR "Daniel Jönsson")
Expand Down
Loading