More CMake modernization

Author: snape

.github/workflows/ci.yml

@@ -167,7 +167,6 @@ jobs:
       - name: setup
         run: |
           brew update -q
-          brew upgrade -f -q
           brew bundle install -q
           brew cleanup -q -s
           rm -rf $(brew --cache)
@@ -463,7 +462,6 @@ jobs:
       - name: setup
         run: |
           brew update -q
-          brew upgrade -f -q
           brew bundle install -q
           brew cleanup -q -s
           rm -rf $(brew --cache)

.reuse/dep5

@@ -65,7 +65,6 @@ endif()
 include(GNUInstallDirs)
 
 set(AVO_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
-set(AVO_CPS_DIR ${CMAKE_INSTALL_LIBDIR}/cps/${PROJECT_NAME})
 set(AVO_INCLUDE_DIR ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME})
 set(AVO_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR})
 set(AVO_LIBRARY AVO)
@@ -75,7 +74,7 @@ set(AVO_NAME "AVO2 Library")
 set(CMAKE_CXX_STANDARD 98)
 set(CMAKE_CXX_STANDARD_REQUIRED OFF)
 set(CMAKE_CXX_EXTENSIONS OFF)
-set(CMAKE_CXX_STANDARD_REQUIRED OFF)
+set(CMAKE_CXX_EXTENSIONS_REQUIRED OFF)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
 option(BUILD_DOCUMENTATION "Build documentation" OFF)
@@ -112,15 +111,15 @@ include(CheckCXXCompilerFlag)
 include(CheckLinkerFlag)
 
 option(ENABLE_HARDENING
-  "Enable hardening compiler and linker flags if supported" OFF)
+  "Enable hardening compiler and linker flags if supported" ON)
 
 if(ENABLE_HARDENING)
   if(MSVC)
     check_cxx_compiler_flag(/GS AVO_COMPILER_SUPPORTS_GS)
     check_cxx_compiler_flag(/guard:cf AVO_COMPILER_SUPPORTS_GUARD_CF)
 
     if(AVO_COMPILER_SUPPORTS_GS)
-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /GS")
+      add_compile_options(/GS)
     endif()
 
     check_linker_flag(CXX /DYNAMICBASE AVO_LINKER_SUPPORTS_DYNAMICBASE)
@@ -130,18 +129,20 @@ if(ENABLE_HARDENING)
     if(AVO_COMPILER_SUPPORTS_GUARD_CF
         AND AVO_LINKER_SUPPORTS_DYNAMICBASE
         AND AVO_LINKER_SUPPORTS_GUARD_CF)
-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /guard:cf")
-      set(CMAKE_EXE_LINKER_FLAGS
-        "${CMAKE_EXE_LINKER_FLAGS} /DYNAMICBASE /GUARD:CF")
-      set(CMAKE_SHARED_LINKER_FLAGS
-        "${CMAKE_SHARED_LINKER_FLAGS} /DYNAMICBASE /GUARD:CF")
+      add_compile_options(/guard:cf)
+      add_link_options(/DYNAMICBASE /GUARD:CF)
     endif()
 
     if(AVO_LINKER_SUPPORTS_NXCOMPAT)
-      set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /NXCOMPAT")
-      set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /NXCOMPAT")
+      add_link_options(/NXCOMPAT)
     endif()
   else()
+    if(APPLE)
+      set(AVO_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}")
+      set(CMAKE_REQUIRED_FLAGS
+        "${CMAKE_REQUIRED_FLAGS} -Werror=unused-command-line-argument")
+    endif()
+
     check_cxx_compiler_flag(-D_FORTIFY_SOURCE=2
       AVO_COMPILER_SUPPORTS_D_FORTIFY_SOURCE_2)
     check_cxx_compiler_flag(-fcf-protection
@@ -162,21 +163,21 @@ if(ENABLE_HARDENING)
     endif()
 
     if(AVO_COMPILER_SUPPORTS_D_FORTIFY_SOURCE_2)
-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_FORTIFY_SOURCE=2")
+      add_compile_options(-D_FORTIFY_SOURCE=2)
     endif()
     if(AVO_COMPILER_SUPPORTS_FCF_PROTECTION)
-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fcf-protection")
+      add_compile_options(-fcf-protection)
     endif()
     if(AVO_COMPILER_SUPPORTS_FNO_COMMON)
-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-common")
+      add_compile_options(-fno-common)
     endif()
     if(AVO_COMPILER_SUPPORTS_FSTACK_CLASH_PROTECTION)
-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-clash-protection")
+      add_compile_options(-fstack-clash-protection)
     endif()
     if(AVO_COMPILER_SUPPORTS_FSTACK_PROTECTOR_STRONG)
-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector-strong")
+      add_compile_options(-fstack-protector-strong)
     elseif(AVO_COMPILER_SUPPORTS_FSTACK_PROTECTOR)
-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector")
+      add_compile_options(-fstack-protector)
     endif()
 
     check_linker_flag(CXX -Wl,-Bsymbolic-functions
@@ -189,42 +190,38 @@ if(ENABLE_HARDENING)
       AVO_LINKER_SUPPORTS_Z_NOEXECSTACK)
     check_linker_flag(CXX -Wl,-z,now AVO_LINKER_SUPPORTS_Z_NOW)
     check_linker_flag(CXX -Wl,-z,relro AVO_LINKER_SUPPORTS_Z_RELRO)
+    check_linker_flag(CXX -Wl,-z,separate-code AVO_LINKER_SUPPORTS_Z_SEPARATE_CODE)
 
     if(AVO_LINKER_SUPPORTS_BSYMBOLIC_FUNCTIONS)
-      set(CMAKE_EXE_LINKER_FLAGS
-        "${CMAKE_EXE_LINKER_FLAGS} -Wl,-Bsymbolic-functions")
-      set(CMAKE_SHARED_LINKER_FLAGS
-        "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-Bsymbolic-functions")
+      add_link_options(-Wl,-Bsymbolic-functions)
     endif()
     if(AVO_COMPILER_SUPPORTS_FSANITIZE_SAFE_STACK
         AND AVO_LINKER_SUPPORTS_FSANITIZE_SAFE_STACK)
-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=safe-stack")
-      set(CMAKE_EXE_LINKER_FLAGS
-        "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=safe-stack")
-      set(CMAKE_SHARED_LINKER_FLAGS
-        "${CMAKE_SHARED_LINKER_FLAGS} -fsanitize=safe-stack")
+      add_compile_options(-fsanitize=safe-stack)
+      add_link_options(-fsanitize=safe-stack)
     endif()
     if(AVO_LINKER_SUPPORTS_Z_DEFS)
-      set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,defs")
-      set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,defs")
+      add_link_options(-Wl,-z,defs)
     endif()
     if(AVO_LINKER_SUPPORTS_Z_NOEXECHEAP)
-      set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,noexecheap")
-      set(CMAKE_SHARED_LINKER_FLAGS
-        "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,noexecheap")
+      add_link_options(-Wl,-z,noexecheap)
     endif()
     if(AVO_LINKER_SUPPORTS_Z_NOEXECSTACK)
-      set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,noexecstack")
-      set(CMAKE_SHARED_LINKER_FLAGS
-        "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,noexecstack")
+      add_link_options(-Wl,-z,noexecstack)
     endif()
     if(AVO_LINKER_SUPPORTS_Z_NOW)
-      set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,now")
-      set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,now")
+      add_link_options(-Wl,-z,now)
     endif()
     if(AVO_LINKER_SUPPORTS_Z_RELRO)
-      set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,relro")
-      set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,relro")
+      add_link_options(-Wl,-z,relro)
+    endif()
+    if(AVO_LINKER_SUPPORTS_Z_SEPARATE_CODE)
+      add_link_options(-Wl,-z,separate-code)
+    endif()
+
+    if(APPLE)
+      set(CMAKE_REQUIRED_FLAGS "${AVO_REQUIRED_FLAGS}")
+      unset(AVO_REQUIRED_FLAGS)
     endif()
   endif()
 endif()
@@ -233,7 +230,7 @@ if(MSVC)
   check_cxx_compiler_flag(/W4 AVO_COMPILER_SUPPORTS_W4)
 
   if(AVO_COMPILER_SUPPORTS_W4)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
+    add_compile_options(/W4)
   endif()
 else()
   check_cxx_compiler_flag(-Wall AVO_COMPILER_SUPPORTS_WALL)
@@ -245,26 +242,24 @@ else()
     AVO_COMPILER_SUPPORTS_WNO_UNUSED)
 
   if(AVO_COMPILER_SUPPORTS_WALL)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
+    add_compile_options(-Wall)
   endif()
   if(AVO_COMPILER_SUPPORTS_WFORMAT_SECURITY)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat-security")
+    add_compile_options(-Wformat-security)
   endif()
   if(AVO_COMPILER_SUPPORTS_WERROR_FORMAT_SECURITY)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=format-security")
+    add_compile_options(-Werror=format-security)
   endif()
   if(AVO_COMPILER_SUPPORTS_WNO_UNUSED)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused")
+    add_compile_options(-Wno-unused)
   endif()
 endif()
 
 if(NOT MSVC)
   check_linker_flag(CXX -Wl,--as-needed AVO_LINKER_SUPPORTS__AS_NEEDED)
 
   if(AVO_LINKER_SUPPORTS__AS_NEEDED)
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed")
-    set(CMAKE_SHARED_LINKER_FLAGS
-      "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--as-needed")
+      add_link_options(-Wl,--as-needed)
   endif()
 endif()
 
@@ -275,83 +270,91 @@ if(WARNINGS_AS_ERRORS)
     check_cxx_compiler_flag(/WX AVO_COMPILER_SUPPORTS_WX)
 
     if(AVO_COMPILER_SUPPORTS_WX)
-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX")
+      add_compile_options(/WX)
     endif()
   else()
     check_cxx_compiler_flag(-Werror AVO_COMPILER_SUPPORTS_WERROR)
 
     if(AVO_COMPILER_SUPPORTS_WERROR)
-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
+      add_compile_options(-Werror)
     endif()
   endif()
 endif()
 
+option(ENABLE_INSTALLATION "Enable installation" ${PROJECT_IS_TOP_LEVEL})
+
 add_subdirectory(src)
 add_subdirectory(examples)
 add_subdirectory(doc)
 
-install(FILES LICENSE
-  COMPONENT runtime
-  DESTINATION ${CMAKE_INSTALL_DOCDIR})
+if(ENABLE_INSTALLATION)
+  install(FILES LICENSE
+    COMPONENT runtime
+    TYPE DOC)
 
-include(CMakePackageConfigHelpers)
+  include(CMakePackageConfigHelpers)
 
-configure_package_config_file(
-  ${PROJECT_NAME}Config.cmake.in ${PROJECT_NAME}Config.cmake
-  INSTALL_DESTINATION ${AVO_DIR}
-  PATH_VARS AVO_INCLUDE_DIR AVO_LIBRARY_DIR)
+  configure_package_config_file(
+    ${PROJECT_NAME}Config.cmake.in ${PROJECT_NAME}Config.cmake
+    INSTALL_DESTINATION ${AVO_DIR}
+    PATH_VARS AVO_INCLUDE_DIR AVO_LIBRARY_DIR)
 
-write_basic_package_version_file(${PROJECT_NAME}ConfigVersion.cmake
-  COMPATIBILITY SameMajorVersion)
+  write_basic_package_version_file(${PROJECT_NAME}ConfigVersion.cmake
+    COMPATIBILITY SameMajorVersion)
 
-install(FILES
-  "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
-  "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake"
-  COMPONENT development
-  DESTINATION ${AVO_DIR})
+  install(FILES
+    "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
+    "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake"
+    COMPONENT development
+    DESTINATION ${AVO_DIR})
 
-find_package(PkgConfig MODULE)
+  find_package(PkgConfig MODULE)
 
-if(PkgConfig_FOUND)
-  configure_file(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc @ONLY)
-  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc"
-    COMPONENT development
-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+  if(PkgConfig_FOUND)
+    configure_file(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc @ONLY)
+    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc"
+      COMPONENT development
+      DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+  endif()
 endif()
 
-include(InstallRequiredSystemLibraries)
-
-set(CPACK_PACKAGE_NAME ${PROJECT_NAME})
-set(CPACK_PACKAGE_CONTACT "Jamie Snape")
-set(CPACK_PACKAGE_VENDOR "University of North Carolina at Chapel Hill")
-set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
-set(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR})
-set(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_VERSION_PATCH})
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PROJECT_DESCRIPTION}")
-set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
-set(CPACK_STRIP_FILES ON)
-
-set(CPACK_SOURCE_IGNORE_FILES
-  _build/ \\\\.git/ \\\\.gitattributes \\\\.github/ \\\\.gitignore bazel-
-  Brewfile)
-set(CPACK_SOURCE_STRIP_FILES ON)
-
-set(CPACK_DEBIAN_COMPRESSION_TYPE zstd)
-set(CPACK_DEBIAN_FILE_NAME DEB-DEFAULT)
-set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/triggers")
-set(CPACK_DEBIAN_PACKAGE_DEPENDS)
-set(CPACK_DEBIAN_PACKAGE_HOMEPAGE ${PROJECT_HOMEPAGE_URL})
-set(CPACK_DEBIAN_PACKAGE_SECTION contrib/libdevel)
-set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
-
-set(CPACK_FREEBSD_PACKAGE_DEPS)
-set(CPACK_FREEBSD_PACKAGE_LICENSE APACHE20)
-set(CPACK_FREEBSD_PACKAGE_WWW ${PROJECT_HOMEPAGE_URL})
-
-set(CPACK_RPM_FILE_NAME RPM-DEFAULT)
-set(CPACK_RPM_PACKAGE_AUTOREQPROV ON)
-set(CPACK_RPM_PACKAGE_LICENSE "ASL 2.0")
-set(CPACK_RPM_PACKAGE_REQUIRES)
-set(CPACK_RPM_PACKAGE_URL ${PROJECT_HOMEPAGE_URL})
-
-include(CPack)
+option(ENABLE_PACKAGING "Enable packaging" ${PROJECT_IS_TOP_LEVEL})
+
+if(ENABLE_PACKAGING)
+  include(InstallRequiredSystemLibraries)
+
+  set(CPACK_PACKAGE_NAME ${PROJECT_NAME})
+  set(CPACK_PACKAGE_CONTACT "Jamie Snape")
+  set(CPACK_PACKAGE_VENDOR "University of North Carolina at Chapel Hill")
+  set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
+  set(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR})
+  set(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_VERSION_PATCH})
+  set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PROJECT_DESCRIPTION}")
+  set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
+  set(CPACK_STRIP_FILES ON)
+
+  set(CPACK_SOURCE_IGNORE_FILES
+    _build/ \\\\.git/ \\\\.gitattributes \\\\.github/ \\\\.gitignore bazel-
+    Brewfile)
+  set(CPACK_SOURCE_STRIP_FILES ON)
+
+  set(CPACK_DEBIAN_COMPRESSION_TYPE zstd)
+  set(CPACK_DEBIAN_FILE_NAME DEB-DEFAULT)
+  set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/triggers")
+  set(CPACK_DEBIAN_PACKAGE_DEPENDS)
+  set(CPACK_DEBIAN_PACKAGE_HOMEPAGE ${PROJECT_HOMEPAGE_URL})
+  set(CPACK_DEBIAN_PACKAGE_SECTION contrib/libdevel)
+  set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
+
+  set(CPACK_FREEBSD_PACKAGE_DEPS)
+  set(CPACK_FREEBSD_PACKAGE_LICENSE APACHE20)
+  set(CPACK_FREEBSD_PACKAGE_WWW ${PROJECT_HOMEPAGE_URL})
+
+  set(CPACK_RPM_FILE_NAME RPM-DEFAULT)
+  set(CPACK_RPM_PACKAGE_AUTOREQPROV ON)
+  set(CPACK_RPM_PACKAGE_LICENSE "ASL 2.0")
+  set(CPACK_RPM_PACKAGE_REQUIRES)
+  set(CPACK_RPM_PACKAGE_URL ${PROJECT_HOMEPAGE_URL})
+
+  include(CPack)
+endif()

CMakeLists.txt

@@ -67,7 +67,9 @@ if(BUILD_DOCUMENTATION AND Doxygen_FOUND)
     ALL
     USE_STAMP_FILE)
 
-  install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/html"
-    COMPONENT documentation
-    DESTINATION ${CMAKE_INSTALL_DOCDIR})
+  if(ENABLE_INSTALLATION)
+    install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/html"
+      COMPONENT documentation
+      TYPE DOC)
+  endif()
 endif()

doc/CMakeLists.txt

@@ -34,7 +34,9 @@
 # <https://gamma.cs.unc.edu/AVO/>
 #
 
-if(BUILD_TESTING)
+option(BUILD_EXAMPLES "Build examples" ${PROJECT_IS_TOP_LEVEL})
+
+if(BUILD_EXAMPLES)
   option(OUTPUT_TIME_AND_POSITIONS "Output time and positions" ON)
 
   if(OUTPUT_TIME_AND_POSITIONS)
@@ -58,6 +60,10 @@ if(BUILD_TESTING)
   endif()
   set_target_properties(Circle PROPERTIES
     INTERPROCEDURAL_OPTIMIZATION ${AVO_EXAMPLES_INTERPROCEDURAL_OPTIMIZATION})
+  if(CMAKE_VERSION VERSION_GREATER_EQUAL 4.1)
+    set_target_properties(Circle PROPERTIES
+      SPDX_LICENSE Apache-2.0)
+  endif()
   add_test(NAME Circle COMMAND Circle)
   set_tests_properties(Circle PROPERTIES
     LABELS medium