Skip to content

Splitting the option for -shared and setting a soname (library path) #138

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

Closed
inkdot7 wants to merge 4 commits into from
Closed

Splitting the option for -shared and setting a soname (library path) #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
854f2fa
Do not implicitly call std::string(0 /* nullptr */). Fixes CI build …
inkdot7 Dec 3, 2025
2a867ef
Do not run github pages deplay for non-main branch, as it fails (perm…
inkdot7 Dec 3, 2025
306cde5
Also not for pull_requst for main, as that triggers for pull requests…
inkdot7 Dec 3, 2025
75f51ec
Splitting the option for -shared and setting a soname (library path).…
Sep 15, 2025
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: 0 additions & 2 deletions .github/workflows/doxygen-gh-pages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ name: Doxygen GitHub Pages Deploy Action

on:
push:
branches: [ "*" ]
pull_request:
branches: [ "main" ]

jobs:
Expand Down
10 changes: 6 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,12 @@ endif

PLATFORM:=$(shell uname)
ifeq ($(PLATFORM),Darwin)
SHAREDSWITCH = -Qunused-arguments -shared -undefined dynamic_lookup -dynamiclib -Wl,-install_name,'@executable_path/../lib/'# NO ENDING SPACE
SHAREDSWITCH = -Qunused-arguments -shared -undefined dynamic_lookup -dynamiclib
SONAMESWITCH = -Wl,-install_name,'@executable_path/../lib/'# NO ENDING SPACE
OSDEF = -DMACOSX
else
SHAREDSWITCH = -shared -Wl,-soname,# NO ENDING SPACE
SHAREDSWITCH = -shared
SONAMESWITCH = -Wl,-soname,# NO ENDING SPACE
OSDEF = -DLINUX
LIBEXTRA = -lrt
endif
Expand Down Expand Up @@ -91,10 +93,10 @@ DEPENDENCIES = $(INC_DIR)/AutoCalibrator.hh \
$(INC_DIR)/TIssData.hh

all: $(BIN_DIR)/iss_sort $(LIB_DIR)/libiss_sort.so

$(LIB_DIR)/libiss_sort.so: iss_sort.o $(OBJECTS) iss_sortDict.o
mkdir -p $(LIB_DIR)
$(LD) iss_sort.o $(OBJECTS) iss_sortDict.o $(SHAREDSWITCH)$@ $(LIBS) -o $@
$(LD) iss_sort.o $(OBJECTS) iss_sortDict.o $(SHAREDSWITCH) $(SONAMESWITCH)$@ $(LIBS) -o $@

$(BIN_DIR)/iss_sort: iss_sort.o $(OBJECTS) iss_sortDict.o
mkdir -p $(BIN_DIR)
Expand Down
4 changes: 2 additions & 2 deletions src/Calibration.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -624,7 +624,7 @@ std::string ISSCalibration::CaenType( unsigned int mod, unsigned int chan ){

}

return 0;
return "";

}

Expand Down Expand Up @@ -714,7 +714,7 @@ std::string ISSCalibration::MesytecType( unsigned int mod, unsigned int chan ){

}

return 0;
return "";

}

Expand Down