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

Fix frs & asyeos cmake errors #1072

Merged
merged 1 commit into from
Jun 19, 2024
Merged

Fix frs & asyeos cmake errors #1072

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -583,6 +583,12 @@ if(NOT MODULE)
if(WITH_EPICS)
add_subdirectory(epics)
endif(WITH_EPICS)
if(WITH_FRS)
add_subdirectory(frs)
endif(WITH_FRS)
if(WITH_ASYEOS)
add_subdirectory(asyeos)
endif(WITH_ASYEOS)

#================================================================================
# TODO: Since other dependencies still use the old cmake configurations, include(ROOTMacros) has to be used. Please change them using CMake targets ASAP.
Expand All @@ -593,12 +599,6 @@ if(NOT MODULE)
if(WITH_ACTAR)
add_subdirectory(actar)
endif(WITH_ACTAR)
if(WITH_FRS)
add_subdirectory(frs)
endif(WITH_FRS)
if(WITH_ASYEOS)
add_subdirectory(asyeos)
endif(WITH_ASYEOS)
if(EXISTS "${PROJECT_SOURCE_DIR}/R3BFileSource")
add_subdirectory(R3BFileSource)
endif(EXISTS "${PROJECT_SOURCE_DIR}/R3BFileSource")
Expand Down
1 change: 1 addition & 0 deletions util/cmake-conan
Open in desktop
Submodule cmake-conan added at 2022a2
Loading