diff --git a/CMakeLists.txt b/CMakeLists.txt index 2d41b7a29..dffff53c5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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. @@ -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") diff --git a/util/cmake-conan b/util/cmake-conan new file mode 160000 index 000000000..2022a2a96 --- /dev/null +++ b/util/cmake-conan @@ -0,0 +1 @@ +Subproject commit 2022a2a96ba8e600eda245bb0b273d652ec02876