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

Add Linux support #38

Merged
merged 5 commits into from
Sep 10, 2024
Merged

Add Linux support #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8ed0c9a
find Spinnaker.h / libSpinnaker.so on Linux
aliddell Oct 3, 2023
fabf260
Merge branch 'main' into build-on-linux
aliddell Oct 3, 2023
41061d1
Merge branch 'main' into build-on-linux
aliddell Aug 27, 2024
c1ea30d
Merge remote-tracking branch 'upstream/main' into build-on-linux
aliddell Sep 7, 2024
021953f
Update changelog.
aliddell Sep 9, 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
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [0.1.2](https://github.com/acquire-project/acquire-driver-spinnaker/compare/v0.1.1...v0.1.2) - 2024-09-09

### Added

- Linux support.

## [0.1.1](https://github.com/acquire-project/acquire-driver-spinnaker/compare/v0.1.0...v0.1.1) - 2023-10-02

### Added
Expand Down
5 changes: 5 additions & 0 deletions cmake/spinnaker.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ find_path(spinnaker_include_dir "Spinnaker.h"
PATH_SUFFIXES
"include/spinnaker" # osx
"FLIR Systems/Spinnaker/include" # windows
"spinnaker/include" # linux
DOC "Directory that contains Spinnaker.h"
NO_CACHE)

Expand All @@ -28,6 +29,10 @@ if(spinnaker_include_dir)
set_target_properties(${tgt} PROPERTIES
IMPORTED_LOCATION "${spinnaker_include_dir}../../lib/libSpinnaker.dylib"
)
elseif(LINUX)
set_target_properties(${tgt} PROPERTIES
IMPORTED_LOCATION "${spinnaker_include_dir}../lib/libSpinnaker.so"
)
endif()
else()
message(STATUS "Could not find Spinnaker.h")
Copy link

Choose a reason for hiding this comment

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

I'd change the message type from STATUS to FATAL_ERROR to properly stop the build from proceeding if it can't find the package.

Expand Down
Loading