From 92c6995ccaebbda87fed13de8eaf3d135d1af0c0 Mon Sep 17 00:00:00 2001
From: Antoine Prouvost <AntoinePrv@users.noreply.github.com>
Date: Tue, 1 Aug 2023 16:12:22 +0200
Subject: [PATCH 1/4] Conventional install locations

---
 CMakeLists.txt | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b2f6089..7ace57d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -84,8 +84,7 @@ if (NANOBENCH_STANDALONE_PROJECT)
 
 
     include(GNUInstallDirs)
-    set(INSTALL_CONFIGDIR ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/cmake)
-    set(INSTALL_LIBDIR ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME})
+    set(NB_INSTALL_CONFIGDIR ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
 
     # Install library target
     add_library(nanobench STATIC ${PROJECT_SOURCE_DIR}/src/test/app/nanobench.cpp)
@@ -98,8 +97,6 @@ if (NANOBENCH_STANDALONE_PROJECT)
     install(
       TARGETS nanobench
       EXPORT install_targets
-      LIBRARY DESTINATION ${INSTALL_LIBDIR}
-      ARCHIVE DESTINATION ${INSTALL_LIBDIR}
     )
 
     # Install targets file

From 17a1f0b598a09d399dd492c72bca5b48ad76c794 Mon Sep 17 00:00:00 2001
From: AntoinePrv <AntoinePrv@users.noreply.github.com>
Date: Tue, 1 Aug 2023 16:32:03 +0200
Subject: [PATCH 2/4] Use NANOBENCH_INSTALL_CONFIGDIR var

---
 CMakeLists.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7ace57d..4c88551 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -84,7 +84,7 @@ if (NANOBENCH_STANDALONE_PROJECT)
 
 
     include(GNUInstallDirs)
-    set(NB_INSTALL_CONFIGDIR ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
+    set(NANOBENCH_INSTALL_CONFIGDIR ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
 
     # Install library target
     add_library(nanobench STATIC ${PROJECT_SOURCE_DIR}/src/test/app/nanobench.cpp)
@@ -106,7 +106,7 @@ if (NANOBENCH_STANDALONE_PROJECT)
       NAMESPACE
         ${PROJECT_NAME}::
       DESTINATION
-        ${INSTALL_CONFIGDIR}
+        ${NANOBENCH_INSTALL_CONFIGDIR}
     )
 
     # Install ${PROJECT_NAME}Config.cmake
@@ -114,11 +114,11 @@ if (NANOBENCH_STANDALONE_PROJECT)
     configure_package_config_file(
       ${CMAKE_CURRENT_SOURCE_DIR}/cmake/${PROJECT_NAME}Config.cmake.in
       ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
-      INSTALL_DESTINATION ${INSTALL_CONFIGDIR}
+      INSTALL_DESTINATION ${NANOBENCH_INSTALL_CONFIGDIR}
     )
     install(FILES
       ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
-      DESTINATION ${INSTALL_CONFIGDIR}
+      DESTINATION ${NANOBENCH_INSTALL_CONFIGDIR}
     )
 
     # Install headers

From b668c3510cfdd2407b274ecd938f9c34050bb691 Mon Sep 17 00:00:00 2001
From: AntoinePrv <AntoinePrv@users.noreply.github.com>
Date: Tue, 1 Aug 2023 16:34:54 +0200
Subject: [PATCH 3/4] Add NANOBENCH_BUILD_TEST CMake var

---
 CMakeLists.txt     | 2 ++
 src/CMakeLists.txt | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4c88551..68642ab 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,6 +16,8 @@ if (NANOBENCH_STANDALONE_PROJECT)
     set(CMAKE_CXX_STANDARD_REQUIRED ON)
     set(CMAKE_CXX_EXTENSIONS OFF)
 
+    option(NANOBENCH_BUILD_TEST "Build nanobench tests" ON)
+
     # configuration see .clang-tidy
     if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
         find_program(CLANG_TIDY_PROGRAM NAMES clang-tidy)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4f1ffce..f20902a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,3 +1,5 @@
 add_subdirectory(cmake)
 add_subdirectory(include)
-add_subdirectory(test)
+if(NANOBENCH_BUILD_TEST)
+  add_subdirectory(test)
+endif()

From 1aa531f0570a83008e97d2e20b78cd8645f852aa Mon Sep 17 00:00:00 2001
From: AntoinePrv <AntoinePrv@users.noreply.github.com>
Date: Tue, 1 Aug 2023 16:37:10 +0200
Subject: [PATCH 4/4] Make NANOBENCH_INSTALL_CONFIGDIR a cache variable

---
 CMakeLists.txt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 68642ab..2f913b5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -86,7 +86,10 @@ if (NANOBENCH_STANDALONE_PROJECT)
 
 
     include(GNUInstallDirs)
-    set(NANOBENCH_INSTALL_CONFIGDIR ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
+    set(
+      NANOBENCH_INSTALL_CONFIGDIR ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
+      CACHE PATH "Installation directory for CMake configuration files"
+    )
 
     # Install library target
     add_library(nanobench STATIC ${PROJECT_SOURCE_DIR}/src/test/app/nanobench.cpp)