From 859eca0898e7418981fe1e11357f263871c9cf7e Mon Sep 17 00:00:00 2001 From: MarkusDittmer <85581959+MarkusDittmer@users.noreply.github.com> Date: Wed, 4 Sep 2024 17:06:16 +0200 Subject: [PATCH] Added matching of LOM PMT + documentation --- CMakeLists.txt | 28 ---------------------------- README.md | 4 +--- 2 files changed, 1 insertion(+), 31 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3d02ee9a6c..dde8b18e5d 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,34 +31,6 @@ find_package(OpenSSL REQUIRED) # For logging with spdlog find_package(spdlog REQUIRED) -if(NOT spdlog_FOUND) - message(STATUS "spdlog not found. Will download and build it.") - - set(SPDLOG_INSTALL_DIR ${CMAKE_BINARY_DIR}/spdlog-install) - - ExternalProject_Add( - spdlog_external - GIT_REPOSITORY https://github.com/gabime/spdlog.git - GIT_TAG v1.11.0 # Specify the version you want - CMAKE_ARGS - -DCMAKE_INSTALL_PREFIX=${SPDLOG_INSTALL_DIR} - -DSPDLOG_BUILD_EXAMPLES=OFF - -DSPDLOG_BUILD_TESTS=OFF - ) - - set(spdlog_INCLUDE_DIRS ${SPDLOG_INSTALL_DIR}/include) - set(spdlog_LIBRARIES ${SPDLOG_INSTALL_DIR}/lib/libspdlog.a) - - add_library(spdlog::spdlog STATIC IMPORTED) - set_target_properties(spdlog::spdlog PROPERTIES - IMPORTED_LOCATION ${spdlog_LIBRARIES} - INTERFACE_INCLUDE_DIRECTORIES ${spdlog_INCLUDE_DIRS} - ) - add_dependencies(spdlog::spdlog spdlog_external) -else() - message(STATUS "Found spdlog: ${spdlog_VERSION}") -endif() - # Include OpenSSL's headers in the project include_directories(${OPENSSL_INCLUDE_DIR}) diff --git a/README.md b/README.md index ade70f1092..84f2c3849b 100644 --- a/README.md +++ b/README.md @@ -33,11 +33,9 @@ For the latest updates and information, check our [GitHub repository](https://gi Install the required dependencies using: ```bash -sudo apt-get -y install libxerces-c-dev libxmu-dev libxpm-dev libglu1-mesa-dev qtbase5-dev libmotif-dev libargtable2-0 libboost-all-dev libqt53dextras5 libfmt-dev +sudo apt-get -y install libxerces-c-dev libxmu-dev libxpm-dev libglu1-mesa-dev qtbase5-dev libmotif-dev libargtable2-0 libboost-all-dev libqt53dextras5 libfmt-dev spdlog-dev ``` -Note: spdlog will be automatically installed by CMake if not found on your system. - ### Installing ROOT 1. Download the latest ROOT binary from [ROOT's official website](https://root.cern/releases/) (e.g., version 6.28/04 at the time of writing), or compile from source.