From 94bc0abdab8d751a70e4335cadc17ab1e2a02307 Mon Sep 17 00:00:00 2001
From: Christopher Dilks <c-dilks@users.noreply.github.com>
Date: Fri, 19 May 2023 22:57:55 -0400
Subject: [PATCH] build: cleanup
---
CMakeLists.txt | 9 +--------
benchmarks/rich/CMakeLists.txt | 15 +++------------
2 files changed, 4 insertions(+), 20 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 469c3d09..df59b35c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,18 +1,12 @@
cmake_minimum_required(VERSION 3.0.0 FATAL_ERROR)
-project(reconstruction_benchmarks
- LANGUAGES CXX
- )
+project(reconstruction_benchmarks LANGUAGES CXX)
cmake_policy(SET CMP0074 NEW) # use `<PackageName>_ROOT` variables
include(GNUInstallDirs)
-# dependencies
-#------------------------
-
# ROOT
find_package(ROOT 6 REQUIRED COMPONENTS Core RIO Hist)
-list(APPEND CMAKE_PREFIX_PATH $ENV{ROOTSYS})
include(${ROOT_USE_FILE})
# data model
@@ -25,5 +19,4 @@ find_package(spdlog REQUIRED)
add_compile_definitions(SPDLOG_FMT_EXTERNAL)
# benchmarks
-#------------------------
add_subdirectory(benchmarks/rich)
diff --git a/benchmarks/rich/CMakeLists.txt b/benchmarks/rich/CMakeLists.txt
index 27200ad8..c73fd86c 100644
--- a/benchmarks/rich/CMakeLists.txt
+++ b/benchmarks/rich/CMakeLists.txt
@@ -9,8 +9,8 @@ list(REMOVE_ITEM algo_sources ${algo_exe_source})
# library
set(algo_lib ${PROJECT_NAME})
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
add_library(${algo_lib} SHARED ${algo_sources})
+target_include_directories(${algo_lib} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
target_compile_options(${algo_lib} PRIVATE -Wall -Wno-misleading-indentation)
# executable
@@ -30,14 +30,5 @@ target_link_libraries(${algo_exe}
)
# installation
-install(FILES
- ${algo_headers}
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}
-)
-install(TARGETS ${algo_exe} ${algo_lib}
- EXPORT ${PROJECT_NAME}Targets
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
- INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${CMAKE_PROJECT_NAME}
-)
+install(FILES ${algo_headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME})
+install(TARGETS ${algo_exe} ${algo_lib})
--
GitLab