Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
H
hallc_tools
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
jlab
hallc
analyzer_software
hallc_tools
Commits
f6bc7a21
Commit
f6bc7a21
authored
4 years ago
by
Sylvester Joosten
Browse files
Options
Downloads
Patches
Plain Diff
disabled hcspec (broken with latest version of ranges)
parent
d45a806f
Branches
master
Tags
v1.2.0
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.clang-format
+0
-4
0 additions, 4 deletions
.clang-format
src/monitor/CMakeLists.txt
+13
-13
13 additions, 13 deletions
src/monitor/CMakeLists.txt
with
13 additions
and
17 deletions
.clang-format
+
0
−
4
View file @
f6bc7a21
...
...
@@ -90,10 +90,6 @@ PenaltyBreakString: 1000
PenaltyExcessCharacter: 1000000
PenaltyReturnTypeOnItsOwnLine: 60
PointerAlignment: Left
RawStringFormats:
- Delimiter: pb
Language: TextProto
BasedOnStyle: google
ReflowComments: true
SortIncludes: true
SortUsingDeclarations: true
...
...
This diff is collapsed.
Click to expand it.
src/monitor/CMakeLists.txt
+
13
−
13
View file @
f6bc7a21
...
...
@@ -86,18 +86,18 @@ target_link_libraries(experiment_monitor
##################################
# spectrometer_settings executable
add_executable
(
hcspec src/spectrometer_settings.cxx
)
target_compile_features
(
hcspec PUBLIC cxx_std_17
)
target_include_directories
(
hcspec
PRIVATE include
PRIVATE
${
CMAKE_CURRENT_SOURCE_DIR
}
/src
)
target_link_libraries
(
hcspec
PRIVATE nlohmann_json::nlohmann_json
PRIVATE fmt::fmt
PUBLIC
${
CXX_FILESYSTEM_LIB
}
PRIVATE hcana::HallC
)
##
add_executable(hcspec src/spectrometer_settings.cxx)
#
target_compile_features(hcspec PUBLIC cxx_std_17)
#
target_include_directories(hcspec
#
PRIVATE include
#
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
#
)
#
target_link_libraries(hcspec
#
PRIVATE nlohmann_json::nlohmann_json
#
PRIVATE fmt::fmt
#
PUBLIC ${CXX_FILESYSTEM_LIB}
#
PRIVATE hcana::HallC
#
)
##################################
# hc_display_server
...
...
@@ -130,7 +130,7 @@ install(FILES
DESTINATION
${
CMAKE_INSTALL_LIBDIR
}
)
install
(
TARGETS Scandalizer experiment_monitor
hcspec
install
(
TARGETS Scandalizer experiment_monitor
EXPORT HallcToolsTargets
RUNTIME DESTINATION
${
CMAKE_INSTALL_BINDIR
}
LIBRARY DESTINATION
${
CMAKE_INSTALL_LIBDIR
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment