Skip to content

Commit ac734da

Browse files
authored
Merge pull request #4 from vetlewi/dev
Dev
2 parents 04fdf53 + 378c8ef commit ac734da

File tree

2 files changed

+23
-1
lines changed

2 files changed

+23
-1
lines changed

.github/workflows/ci.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
on:
2+
push:
3+
tags: 'v*'
4+
5+
jobs:
6+
homebrew:
7+
name: Bump Homebrew formula
8+
runs-on: ubuntu-latest
9+
steps:
10+
- uses: mislav/bump-homebrew-formula-action@v3
11+
with:
12+
homebrew-tap: 'vetlewi/homebrew-formula'
13+
formula-name: 'xia2tree'
14+
formula-path: '/'
15+
env:
16+
# the personal access token should have "repo" & "workflow" scopes
17+
COMMITTER_TOKEN: ${{ secrets.COMMITTER_TOKEN }}

CMakeLists.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ list(APPEND CMAKE_PREFIX_PATH $ENV{ROOTSYS})
55
include(cmake/CPM.cmake)
66

77
# PackageProject.cmake will be used to make our target installable
8-
CPMAddPackage("gh:TheLartians/PackageProject.cmake@1.8.0")
8+
CPMAddPackage("gh:TheLartians/PackageProject.cmake@1.13.0")
99

1010
find_package(Threads REQUIRED)
1111
find_package(ROOT REQUIRED COMPONENTS RIO Tree Hist)
@@ -130,3 +130,8 @@ add_executable(XIA2tree main.cpp)
130130
set_target_properties(XIA2tree PROPERTIES CXX_STANDARD 17)
131131
target_link_libraries(XIA2tree PRIVATE OCL::Histogram UserSort XIAfuncs readerwriterqueue concurrentqueue)
132132
add_dependencies(XIA2tree ParticleCoincidenceSort)
133+
134+
include(GNUInstallDirs)
135+
install(TARGETS XIA2tree
136+
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
137+
)

0 commit comments

Comments
 (0)