Skip to content

Commit 65679ad

Browse files
committed
change zerr-core install location
1 parent c672e09 commit 65679ad

File tree

6 files changed

+20
-15
lines changed

6 files changed

+20
-15
lines changed

.github/workflows/build-puredata-plugins-with-pd-lib-builder.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,14 +118,18 @@ jobs:
118118
with:
119119
submodules: true
120120

121-
- name: List Available Artifacts
122-
run: ls -R
121+
# - name: List Available Artifacts
122+
# run: ls -R
123123

124124
- name: Download zerr-core library
125125
uses: actions/download-artifact@v4
126126
with:
127127
name: zerr-core
128-
path: core/usr/
128+
path: core/lib/
129+
# github-token: ${{ secrets.GH_PAT }} # token with actions:read permissions on target repo
130+
131+
- name: Display structure of downloaded files
132+
run: ls -R core/lib/
129133

130134
- name: Install Pure Data
131135
run: brew install --cask pd

.github/workflows/build-zerr-core-static-library.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,5 @@ jobs:
3838
uses: actions/upload-artifact@v4
3939
with:
4040
name: zerr-core
41-
path: core/usr
42-
retention-days: 1
41+
path: core/lib/libzerr_core.a
42+
retention-days: 1

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
*.pd_dll
66
*.ipynb
77

8+
CMakeUserPresets.json
9+
810
builddir/
911
fftw3/
1012
yaml-cpp/

core/CMakeLists.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,5 @@ message(STATUS "This is the zerr_core_static OUTPUT_NAME: " ${OUTPUT_VALUE})
3030
set(CMAKE_INSTALL_PREFIX ${CMAKE_SOURCE_DIR})
3131

3232
# Install the static library into the local "lib" folder
33-
install(TARGETS zerr_core_static ARCHIVE DESTINATION usr/lib)
34-
install(DIRECTORY include/ DESTINATION usr/include)
35-
install(DIRECTORY include/ DESTINATION usr/include)
33+
install(TARGETS zerr_core_static ARCHIVE DESTINATION lib)
34+
# install(DIRECTORY include/ DESTINATION usr/include)

core/lib/libzerr_core.a

332 KB
Binary file not shown.

puredata/Makefile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ldlibs = -l$(CONAN_LIBS_YAML_CPP) # Link the yaml-cpp library
1212
# $(info CONAN_LIB_DIRS_YAML_CPP is $(CONAN_LIB_DIRS_YAML_CPP))
1313
# $(info CONAN_LIBS_YAML_CPP is $(CONAN_LIBS_YAML_CPP))
1414

15-
ldflags += -L../core/usr/lib
15+
ldflags += -L../core/lib
1616
ldlibs += -lzerr_core
1717

1818
# Library directory name: zerr
@@ -48,13 +48,13 @@ datafiles += help/zerr_disperser~-help.pd
4848
datafiles += help/circulation_8.yaml
4949

5050
# Add Zerr* core headers
51-
CC += -I../core/usr/include/utils
52-
CC += -I../core/usr/include/modules
53-
CC += -I../core/usr/include/features
51+
CC += -I../core/include/utils
52+
CC += -I../core/include/modules
53+
CC += -I../core/include/features
5454

55-
CXX += -I../core/usr/include/utils
56-
CXX += -I../core/usr/include/modules
57-
CXX += -I../core/usr/include/features
55+
CXX += -I../core/include/utils
56+
CXX += -I../core/include/modules
57+
CXX += -I../core/include/features
5858

5959
# Add Puredata wraper headers
6060
CC += -Iinclude

0 commit comments

Comments
 (0)