Mark libassert as a SYSTEM library

Author: Morwenn

CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2015-2025 Morwenn
+# Copyright (c) 2015-2026 Morwenn
 # SPDX-License-Identifier: MIT
 
 cmake_minimum_required(VERSION 3.8.0)
@@ -8,6 +8,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 project(cpp-sort VERSION 1.17.1 LANGUAGES CXX)
 
 include(CMakePackageConfigHelpers)
+include(cpp-sort-utils)
 include(GNUInstallDirs)
 
 # Project options
@@ -28,6 +29,7 @@ if (CPPSORT_USE_LIBASSERT)
                      UPDATE_DISCONNECTED 1
     )
     add_subdirectory(${libassert_SOURCE_DIR} ${libassert_BINARY_DIR})
+    mark_system_library(libassert-lib)
 endif()
 
 # Create cpp-sort library and configure it

cmake/cpp-sort-utils.cmake

@@ -1,4 +1,4 @@
-# Copyright (c) 2019-2023 Morwenn
+# Copyright (c) 2019-2025 Morwenn
 # SPDX-License-Identifier: MIT
 
 # Add a selection of warnings to a target
@@ -15,3 +15,17 @@ macro(cppsort_add_warnings target)
         )
     endif()
 endmacro()
+
+# Mark a target as a SYSTEM library
+function(mark_system_library target)
+    get_target_property(
+        TARGET_INCLUDE_DIR
+        ${target}
+        INTERFACE_INCLUDE_DIRECTORIES
+    )
+    set_target_properties(
+        ${target}
+        PROPERTIES
+            INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${TARGET_INCLUDE_DIR}"
+    )
+endfunction()

conanfile.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2018-2025 Morwenn
+# Copyright (c) 2018-2026 Morwenn
 # SPDX-License-Identifier: MIT
 
 import os.path
@@ -29,7 +29,8 @@ class CppSortConan(ConanFile):
     exports_sources = [
         "include/*",
         "CMakeLists.txt",
-        "cmake/cpp-sort-config.cmake.in"
+        "cmake/cpp-sort-config.cmake.in",
+        "cmake/cpp-sort-utils.cmake",
     ]
     settings = "os", "compiler", "build_type", "arch"
     package_type = "header-library"

tests/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2015-2025 Morwenn
+# Copyright (c) 2015-2026 Morwenn
 # SPDX-License-Identifier: MIT
 
 include(cpp-sort-utils)
@@ -31,11 +31,9 @@ else()
                      UPDATE_DISCONNECTED 1
     )
     add_subdirectory(${Catch2_SOURCE_DIR} ${Catch2_BINARY_DIR})
+    mark_system_library(Catch2)
+    mark_system_library(Catch2WithMain)
     list(APPEND CMAKE_MODULE_PATH ${Catch2_SOURCE_DIR}/extras)
-
-    # Make Catch2::Catch2 a SYSTEM target
-    get_target_property(Catch2_INCLUDE_DIRECTORY Catch2 INTERFACE_INCLUDE_DIRECTORIES)
-    set_target_properties(Catch2 PROPERTIES INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${Catch2_INCLUDE_DIRECTORY}")
 endif()
 include(Catch)
 
@@ -57,10 +55,8 @@ else()
 
     set(RC_INSTALL_ALL_EXTRAS ON)
     add_subdirectory(${RapidCheck_SOURCE_DIR} ${RapidCheck_BINARY_DIR})
-
-    # Make rapidcheck a SYSTEM target
-    get_target_property(rapidcheck_INCLUDE_DIRECTORY rapidcheck INTERFACE_INCLUDE_DIRECTORIES)
-    set_target_properties(rapidcheck PROPERTIES INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${rapidcheck_INCLUDE_DIRECTORY}")
+    mark_system_library(rapidcheck)
+    mark_system_library(rapidcheck_catch)
 endif()
 
 ########################################