build(cmake)

Author: c0nstexpr

CMakeLists.txt

@@ -12,7 +12,7 @@ project("stdsharp" VERSION 0.1.0 LANGUAGES CXX)
 
 init_proj()
 
-config_interface_lib(${PROJECT_NAME})
+config_interface_lib(${PROJECT_NAME} SYSTEM_INCLUDED ON)
 
 #
 # Model project dependencies
@@ -22,8 +22,8 @@ find_package(range-v3 CONFIG REQUIRED)
 
 target_compile_options(
     ${PROJECT_NAME}
-    INTERFACE $<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:GNU>>:-Wno-logical-op-parentheses -Wno-dangling-else -Werror>
-              $<$<CXX_COMPILER_ID:MSVC>:/W4 /WX>
+    INTERFACE $<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:GNU>>:-Wno-logical-op-parentheses -Wno-dangling-else>
+              $<$<CXX_COMPILER_ID:MSVC>:/wd4127>
 )
 
 target_link_libraries(
@@ -55,6 +55,8 @@ install(
 
 if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
     set(STDSHARP_BUILD_TEST ON)
+else()
+    target_include_as_system(${PROJECT_NAME} INTERFACE)
 endif()
 option(STDSHARP_BUILD_TEST "Whether to build test")
 

cmake/Utils.cmake

@@ -24,13 +24,13 @@ include(cmake/Conan.cmake)
 conan()
 
 function(init_proj)
-    cmake_parse_arguments(${CMAKE_CURRENT_FUNCTION} "USE_ALT_NAMES" "" "" ${ARGN})
+    cmake_parse_arguments(ARG "USE_ALT_NAMES" "" "" ${ARGN})
     message(STATUS "Started CMake for ${PROJECT_NAME} v${PROJECT_VERSION}...\n")
 
     #
     # Setup alternative names
     #
-    if (${${CMAKE_CURRENT_FUNCTION}_USE_ALT_NAMES})
+    if (${ARG_USE_ALT_NAMES})
         string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWERCASE)
         string(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UPPERCASE)
     endif ()
@@ -43,11 +43,18 @@ function(init_proj)
     endif ()
 endfunction()
 
+function(target_include_as_system target_name lib_type)
+    target_include_directories(
+        ${target_name}
+        SYSTEM BEFORE ${lib_type} $<TARGET_PROPERTY:INTERFACE_INCLUDE_DIRECTORIES>
+    )
+endfunction()
+
 #
 # Create header only library
 #
 function(config_interface_lib lib_name)
-    cmake_parse_arguments(${CMAKE_CURRENT_FUNCTION} "" "STD" "" ${ARGN})
+    cmake_parse_arguments(ARG "" "STD" "" ${ARGN})
 
     add_library(${lib_name} INTERFACE)
 
@@ -56,7 +63,7 @@ function(config_interface_lib lib_name)
     #
     # Set the project standard and warnings
     #
-    set(std ${${CMAKE_CURRENT_FUNCTION}_STD})
+    set(std ${ARG_STD})
     if (${std})
         target_compile_features(${lib_name} INTERFACE cxx_std_${std})
         message(STATUS "Using c++ ${std}.\n")
@@ -68,16 +75,16 @@ function(config_interface_lib lib_name)
     target_include_directories(
         ${lib_name}
         INTERFACE
-        $<INSTALL_INTERFACE:include>
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+            $<INSTALL_INTERFACE:include>
+            $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
     )
 endfunction()
 
 #
 # Create static or shared library, setup header and source files
 #
 function(config_lib lib_name includes src lib_type)
-    cmake_parse_arguments(${CMAKE_CURRENT_FUNCTION} "" "STD" "" ${ARGN})
+    cmake_parse_arguments(ARG "" "STD" "" ${ARGN})
 
     # Find all headers and implementation files
     list(JOIN includes "\n    " includes_str)
@@ -99,7 +106,7 @@ function(config_lib lib_name includes src lib_type)
     #
     # Set the project standard and warnings
     #
-    set(std ${${CMAKE_CURRENT_FUNCTION}_STD})
+    set(std ${ARG_STD})
     if (${std})
         target_compile_features(${lib_name} PUBLIC cxx_std_${std})
         message(STATUS "Using c++ ${std}.\n")
@@ -111,31 +118,31 @@ function(config_lib lib_name includes src lib_type)
     target_include_directories(
         ${lib_name}
         PUBLIC
-        $<INSTALL_INTERFACE:include>
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+            $<INSTALL_INTERFACE:include>
+            $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
     )
 endfunction()
 
 #
 # Create executable, setup header and source files
 #
 function(config_exe exe_name exe_src)
-    cmake_parse_arguments(${CMAKE_CURRENT_FUNCTION} "" "STD" "INCLUDES;SOURCES" ${ARGN})
-    set(std ${${CMAKE_CURRENT_FUNCTION}_STD})
+    cmake_parse_arguments(ARG "" "STD" "INCLUDES;SOURCES" ${ARGN})
+    set(std ${ARG_STD})
 
     list(JOIN exe_src "\n    " exe_src_str)
     verbose_message("Found the following executable source files:\n    ${exe_src_str}")
 
     add_executable(${exe_name} ${exe_src})
 
-    if (${CMAKE_CURRENT_FUNCTION}_INCLUDES)
+    if (ARG_INCLUDES)
         verbose_message("Configuring executable library")
 
-        if (${CMAKE_CURRENT_FUNCTION}_SOURCES)
+       if (ARG_SOURCES)
             config_lib(
                 ${exe_name}_LIB
-                "${${CMAKE_CURRENT_FUNCTION}_INCLUDES}"
-                "${${CMAKE_CURRENT_FUNCTION}_SOURCES}"
+                "${ARG_INCLUDES}"
+                "${ARG_SOURCES}"
                 STATIC
                 STD ${std}
             )

tests/CMakeLists.txt

@@ -55,40 +55,40 @@ set(
 config_exe(${PROJECT_NAME} ${exe_src} INCLUDES "${headers}" SOURCES "${src}")
 
 message(STATUS "adding boost-ext/ut")
-
 include(FetchContent)
 FetchContent_Declare(
   boost-ext-ut
-  GIT_REPOSITORY https://github.com/boost-ext/ut.git
-  GIT_TAG 1d304bb6e67b51dfa4fdd794eac537913d5f9e42
+  GIT_REPOSITORY https://github.com/BlurringShadow/ut.git
+  GIT_TAG 581e958f41943553012407c6a0b99d632ddcc032
 )
-if(MSVC)
-    # target_compile_options(ut INTERFACE "/interface" "/translateInclude" "/ifcOnly")
-    message(STATUS "disable module for msvc")
-    set(BOOST_UT_DISABLE_MODULE ON)
-endif()
 FetchContent_MakeAvailable(boost-ext-ut)
 
-find_program(CLANG_TIDY "clang-tidy")
-if(CLANG_TIDY)
-    message(STATUS "found clang-tidy: ${CLANG_TIDY}")
-    set_target_properties(${PROJECT_NAME} PROPERTIES CXX_CLANG_TIDY ${CLANG_TIDY} -p ${CMAKE_CURRENT_BINARY_DIR})
-else()
-    message(STATUS "clang-tidy not found")
-endif()
-
-target_include_directories(
+target_compile_options(
     ${PROJECT_NAME}_LIB
-    SYSTEM PUBLIC $<TARGET_PROPERTY:ut,INTERFACE_INCLUDE_DIRECTORIES>
+    PUBLIC $<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:GNU>>:-Werror>
+           $<$<CXX_COMPILER_ID:MSVC>:/W4 /WX>
 )
+
 target_link_libraries(${PROJECT_NAME}_LIB PUBLIC stdsharp ut)
 
+#
+# Configure clang-tidy
+#
+if(NOT MSVC)
+    find_program(CLANG_TIDY "clang-tidy")
+    if(CLANG_TIDY)
+        message(STATUS "found clang-tidy: ${CLANG_TIDY}")
+        set_target_properties(${PROJECT_NAME} PROPERTIES CXX_CLANG_TIDY ${CLANG_TIDY} -p ${CMAKE_CURRENT_BINARY_DIR})
+    else()
+        message(STATUS "clang-tidy not found")
+    endif()
+endif()
+
 # TODO enable coverage
 # if(${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
 #     target_enable_coverage(${PROJECT_NAME} FORMAT lcov)
 # endif()
 
-
 #
 # Add the unit tests
 #