Improve CMake

Author: foonathan

CMakeLists.txt

@@ -2,9 +2,10 @@
 # This file is subject to the license terms in the LICENSE file
 # found in the top-level directory of this distribution.
 
-cmake_minimum_required(VERSION 3.1)
-project(array)
+cmake_minimum_required(VERSION 3.8)
+project(foonathan_array VERSION 0.0.0)
 
+# source files
 set(detail_header_files
         ${CMAKE_CURRENT_SOURCE_DIR}/include/foonathan/array/detail/all_of.hpp
         ${CMAKE_CURRENT_SOURCE_DIR}/include/foonathan/array/detail/is_trivial.hpp
@@ -39,14 +40,37 @@ set(header_files
         ${CMAKE_CURRENT_SOURCE_DIR}/include/foonathan/array/small_bag.hpp
         ${CMAKE_CURRENT_SOURCE_DIR}/include/foonathan/array/variant_bag.hpp
     )
+
+# main target
 add_library(foonathan_array INTERFACE)
-target_sources(foonathan_array INTERFACE ${detail_header_files} ${header_files})
-target_include_directories(foonathan_array INTERFACE include)
-if(MSVC)
-    target_compile_definitions(foonathan_array INTERFACE "-D_SCL_SECURE_NO_WARNINGS")
+add_library(foonathan::foonathan_array ALIAS foonathan_array)
+target_sources(foonathan_array INTERFACE $<BUILD_INTERFACE:${detail_header_files} ${header_files}>)
+target_compile_features(foonathan_array INTERFACE cxx_std_11)
+target_include_directories(foonathan_array SYSTEM INTERFACE
+                               $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/>
+                               $<INSTALL_INTERFACE:include/>)
+
+# installation
+if(NOT dependency_via_submodule)
+    include(CMakePackageConfigHelpers)
+    write_basic_package_version_file(foonathan_array-config-version.cmake COMPATIBILITY ExactVersion)
+    install(TARGETS foonathan_array EXPORT foonathan_array_targets
+            INCLUDES DESTINATION include)
+    install(EXPORT foonathan_array_targets
+            DESTINATION lib/cmake/foonathan_array
+            FILE foonathan_array-targets.cmake
+            NAMESPACE foonathan::)
+    install(DIRECTORY include/
+            DESTINATION include)
+    install(FILES foonathan_array-config.cmake ${CMAKE_CURRENT_BINARY_DIR}/foonathan_array-config-version.cmake
+            DESTINATION lib/cmake/foonathan_array)
+else()
+    message(STATUS "Dependency installed via submodule, installation unavailable")
 endif()
 
-if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
+# subdirectories
+option(FOONATHAN_ARRAY_BUILD_TEST "build tests of foonathan/array" OFF)
+if(${FOONATHAN_ARRAY_BUILD_TEST} OR (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR))
     enable_testing()
     add_subdirectory(test)
 endif()

foonathan_array-config.cmake

@@ -0,0 +1,6 @@
+# Copyright (C) 2018 Jonathan Müller <[email protected]>
+# This file is subject to the license terms in the LICENSE file
+# found in the top-level directory of this distribution.
+
+include(CMakeFindDependencyMacro)
+include("${CMAKE_CURRENT_LIST_DIR}/foonathan_array-targets.cmake")

test/CMakeLists.txt

@@ -2,6 +2,7 @@
 # This file is subject to the license terms in the LICENSE file
 # found in the top-level directory of this distribution.
 
+# get Catch
 if(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/catch.hpp)
     file(DOWNLOAD
          https://raw.githubusercontent.com/catchorg/Catch2/master/single_include/catch2/catch.hpp
@@ -18,6 +19,7 @@ if(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/catch.hpp)
     endif()
 endif()
 
+# unit tests
 set(tests
     array.cpp
     array_view.cpp
@@ -47,8 +49,20 @@ add_executable(foonathan_array_test
                 equal_checker.hpp
                 leak_checker.hpp
                 ${tests})
-target_include_directories(foonathan_array_test SYSTEM PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
-target_link_libraries(foonathan_array_test PUBLIC foonathan_array)
-set_target_properties(foonathan_array_test PROPERTIES CXX_STANDARD 11)
+target_include_directories(foonathan_array_test PUBLIC
+                               ${CMAKE_CURRENT_SOURCE_DIR}
+                               ${CMAKE_CURRENT_SOURCE_DIR}/../include
+                           SYSTEM PUBLIC
+                               ${CMAKE_CURRENT_BINARY_DIR})
+target_compile_features(foonathan_array_test PUBLIC cxx_std_11)
+target_compile_options(foonathan_array_test PUBLIC
+                       # clang/GCC warnings
+                       $<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:GNU>>:
+                       -pedantic-errors -Werror -Wall -Wextra -Wconversion -Wsign-conversion>
+                       # disable noexcept type warning on GCC
+                       $<$<CXX_COMPILER_ID:GNU>: -Wno-noexcept-type>
+                       # MSVC warnings
+                       $<$<CXX_COMPILER_ID:MSVC>:
+                       /WX /W4 /D_SCL_SECURE_NO_WARNINGS>)
 
 add_test(NAME test COMMAND foonathan_array_test)