✅ Update CMakeLists

Author: acd1034

CMakeLists.txt

@@ -1,26 +1,58 @@
-cmake_minimum_required(VERSION 3.8)
-project(iris CXX)
+cmake_minimum_required(VERSION 3.12)
+project(StrTpl
+  VERSION 0.1.0
+  LANGUAGES CXX
+)
+include(GNUInstallDirs)
 
-# Specify build type if not
+# Creates a library StrTpl which is an interface (header files only)
+add_library(StrTpl INTERFACE)
+# If you want to use StrTpl prefer to link against StrTpl using this alias target
+add_library(StrTpl::StrTpl ALIAS StrTpl)
+
+# Specify build type ifnot
 if(NOT CMAKE_BUILD_TYPE)
   set(CMAKE_BUILD_TYPE "Release")
   message(STATUS "CMAKE_BUILD_TYPE not specified: Use Release by default.")
 endif(NOT CMAKE_BUILD_TYPE)
 
 # Determine whether this is a standalone project or included by other projects
-set(IRIS_STANDALONE_PROJECT OFF)
-if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
-  set(IRIS_STANDALONE_PROJECT ON)
+set(STRTPL_STANDALONE_PROJECT OFF)
+if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
+  set(STRTPL_STANDALONE_PROJECT ON)
 endif()
 
 # Project options
-option(IRIS_TEST "Build and perform iris tests" ${IRIS_STANDALONE_PROJECT})
+option(STRTPL_INSTALL "Generate and install StrTpl target" ${STRTPL_STANDALONE_PROJECT})
+option(STRTPL_TEST "Build and perform StrTpl tests" ${STRTPL_STANDALONE_PROJECT})
 
 # Setup include directory
 add_subdirectory(include)
 
-# Setup test directory
-if (IRIS_TEST)
+if(STRTPL_INSTALL)
+  install(
+    TARGETS StrTpl
+    EXPORT StrTplConfig
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    # RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+  )
+  install(
+    DIRECTORY include/strtpl
+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+  )
+  # Make library importable by other projects
+  install(
+    EXPORT StrTplConfig
+    NAMESPACE StrTpl::
+    FILE StrTplConfig.cmake
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/StrTpl
+    # EXPORT_LINK_INTERFACE_LIBRARIES
+  )
+endif()
+
+if(STRTPL_TEST)
   include(CTest)
   add_subdirectory(tests)
 endif()

include/CMakeLists.txt

@@ -1,28 +1,13 @@
-# Creates a library iris which is an interface (header files only)
-add_library(iris INTERFACE)
-# If you want to use iris prefer to link against iris using this alias target
-add_library(iris::iris ALIAS iris)
-# Set C++ version
-target_compile_features(iris INTERFACE cxx_std_20)
-set_target_properties(iris PROPERTIES
-  CXX_STANDARD_REQUIRED ON
-  CXX_EXTENSIONS OFF
-)
-
 # Add include folders to the library and targets that consume it the SYSTEM
 # keyword suppresses warnings for users of the library
-if(IRIS_STANDALONE_PROJECT)
-  target_include_directories(iris INTERFACE
+if(STRTPL_STANDALONE_PROJECT)
+  target_include_directories(StrTpl INTERFACE
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
     $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
   )
 else()
-  target_include_directories(iris SYSTEM INTERFACE
+  target_include_directories(StrTpl SYSTEM INTERFACE
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
     $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
   )
 endif()
-
-# Add (header only) external libraries
-# find_package(Boost 1.61.0 REQUIRED)
-# target_link_libraries(iris SYSTEM INTERFACE Boost::boost)

tests/CMakeLists.txt

@@ -1,10 +1,23 @@
-cmake_minimum_required(VERSION 3.8)
-project(iris_tests CXX)
+cmake_minimum_required(VERSION 3.12)
+project(StrTplTests
+  LANGUAGES CXX
+)
 include(CTest)
 
+# Import the globally installed StrTpl ifCMake has been started independently in
+# this directory with tests
+if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
+  find_package(StrTpl REQUIRED)
+endif()
+
 # This interface adds compile options to how the tests are run
-add_library(iris_tests_config INTERFACE)
-target_compile_options(iris_tests_config INTERFACE
+add_library(StrTplTestsConfig INTERFACE)
+target_compile_features(StrTplTestsConfig INTERFACE cxx_std_20)
+set_target_properties(StrTplTestsConfig PROPERTIES
+  CXX_STANDARD_REQUIRED ON
+  CXX_EXTENSIONS OFF
+)
+target_compile_options(StrTplTestsConfig INTERFACE
   -fno-strict-aliasing
   -Wall
   -Wcast-align
@@ -31,12 +44,12 @@ target_compile_options(iris_tests_config INTERFACE
   >
   # $<$<CXX_COMPILER_ID:Clang>:
   #   $<$<AND:$<VERSION_GREATER:$<CXX_COMPILER_VERSION>,4.99>,$<VERSION_LESS:$<CXX_COMPILER_VERSION>,6>>:
-  #     $<$<EQUAL:${IRIS_CXX_STANDARD},17>:-Wno-undefined-func-template>
+  #     $<$<EQUAL:${STRTPL_CXX_STANDARD},17>:-Wno-undefined-func-template>
   #   >
   # >
   # $<$<CXX_COMPILER_ID:AppleClang>:
   #   $<$<AND:$<VERSION_GREATER:$<CXX_COMPILER_VERSION>,9.1>,$<VERSION_LESS:$<CXX_COMPILER_VERSION>,10>>:
-  #     $<$<EQUAL:${IRIS_CXX_STANDARD},17>:-Wno-undefined-func-template>
+  #     $<$<EQUAL:${STRTPL_CXX_STANDARD},17>:-Wno-undefined-func-template>
   #   >
   # >
   $<$<CXX_COMPILER_ID:GNU>:
@@ -53,19 +66,10 @@ target_compile_options(iris_tests_config INTERFACE
   >
 )
 
-# Import the globally installed iris if CMake has been started independently in
-# this directory with tests
-if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
-  find_package(iris::iris REQUIRED)
-endif()
-
-# Use Catch2 as a unit testing framework
-# find_package(Catch2)
-
 Include(FetchContent)
 FetchContent_Declare(Catch2
   GIT_REPOSITORY https://github.com/catchorg/Catch2.git
-  GIT_TAG        v2.13.6)
+  GIT_TAG        v3.0.1)
 FetchContent_MakeAvailable(Catch2)
 
 add_subdirectory(main)