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

Use pimega library from system installation #1

Draft
wants to merge 2 commits into
base: lumentum-v3
Choose a base branch
from
Draft

Use pimega library from system installation #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
13a6c8b
Use top-level areaDetector settings for glib
henriquesimoes Nov 4, 2024
c39bede
Use pimega library from system installation
henriquesimoes Aug 23, 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
3 changes: 0 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@
TOP = .
include $(TOP)/configure/CONFIG
DIRS := $(DIRS) configure
DIRS := $(DIRS) pimegaSupport
DIRS := $(DIRS) pimegaApp

pimegaApp_DEPEND_DIRS += pimegaSupport
ifeq ($(BUILD_IOCS), YES)
DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard iocs))
iocs_DEPEND_DIRS += pimegaApp
Expand Down
2 changes: 2 additions & 0 deletions configure/CONFIG_SITE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ CHECK_RELEASE = YES

HOST_OPT=NO

PIMEGA_INCLUDE=/usr/local/include/pimega

# Set this when you only want to compile this application
# for a subset of the cross-compiled target architectures
# that Base is built for.
Expand Down
5 changes: 2 additions & 3 deletions pimegaApp/src/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@ include $(TOP)/configure/CONFIG
# Build an Support Module
# -------------------------------

USR_INCLUDES += -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include

#INC += pimegaDetector.h
USR_INCLUDES += $(addprefix -I, $(GLIB_INCLUDE))
USR_INCLUDES += $(addprefix -I, $(PIMEGA_INCLUDE))

LIBRARY_IOC_Linux += pimegaDetector

Expand Down
67 changes: 0 additions & 67 deletions pimegaSupport/Makefile
View file
Open in desktop

This file was deleted.