diff --git a/.github/constants.env b/.github/constants.env index f77ffd0..d1f8145 100644 --- a/.github/constants.env +++ b/.github/constants.env @@ -1 +1 @@ -PROJECT_NAME=patatocs \ No newline at end of file +PROJECT_NAME=zephyr \ No newline at end of file diff --git a/.gitignore b/.gitignore index d71c34c..5e35788 100644 --- a/.gitignore +++ b/.gitignore @@ -5,8 +5,8 @@ cmake-build-*/ conan-cache/ CMakeCache.txt .cache -libpatat* -patat* +libzephyr* +zephyr* log.txt *gcno tests diff --git a/CMakeLists.txt b/CMakeLists.txt index 4e296ce..08ee1ab 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,7 +18,7 @@ set(CMAKE_CXX_EXTENSIONS OFF) # Set the project name and language project( - patatocs + zephyr VERSION 0.0.1 DESCRIPTION "" HOMEPAGE_URL "%%myurl%%" @@ -27,13 +27,13 @@ project( include(cmake/PreventInSourceBuilds.cmake) include(ProjectOptions.cmake) -patatocs_setup_options() +zephyr_setup_options() -patatocs_global_options() +zephyr_global_options() include(Dependencies.cmake) -patatocs_setup_dependencies() +zephyr_setup_dependencies() -patatocs_local_options() +zephyr_local_options() # don't know if this should be set globally from here or not... set(CMAKE_CXX_VISIBILITY_PRESET hidden) @@ -47,18 +47,18 @@ string( 8 GIT_SHORT_SHA) -target_compile_features(patatocs_options INTERFACE cxx_std_${CMAKE_CXX_STANDARD}) +target_compile_features(zephyr_options INTERFACE cxx_std_${CMAKE_CXX_STANDARD}) -add_library(patatocs::patatocs_options ALIAS patatocs_options) -add_library(patatocs::patatocs_warnings ALIAS patatocs_warnings) +add_library(zephyr::zephyr_options ALIAS zephyr_options) +add_library(zephyr::zephyr_warnings ALIAS zephyr_warnings) # configure files based on CMake configuration options add_library(${PROJECT_NAME}) target_link_libraries(${PROJECT_NAME} - PUBLIC patatocs::patatocs_options - patatocs::patatocs_warnings + PUBLIC zephyr::zephyr_options + zephyr::zephyr_warnings ) set_target_properties(${PROJECT_NAME} @@ -103,11 +103,11 @@ endif() # Add other targets that you want installed here, by default we just package the one executable # we know we want to ship -# patatocs_package_project( +# zephyr_package_project( # TARGETS -# patatocs -# patatocs_options -# patatocs_warnings +# zephyr +# zephyr_options +# zephyr_warnings # FIXME: this does not work! CK # PRIVATE_DEPENDENCIES_CONFIGURED project_options project_warnings # ) diff --git a/Dependencies.cmake b/Dependencies.cmake index 0a76b19..0871103 100644 --- a/Dependencies.cmake +++ b/Dependencies.cmake @@ -12,7 +12,7 @@ message(STATUS "Catch2_FOUND: ${Catch2_FOUND}") message(STATUS "spdlog_FOUND: ${spdlog_FOUND}") message(STATUS "Boost_FOUND: ${Boost_FOUND}") -function(patatocs_setup_dependencies) +function(zephyr_setup_dependencies) # For each dependency, see if it's # already been provided to us by a parent project diff --git a/ProjectOptions.cmake b/ProjectOptions.cmake index 6c7d232..1c9364a 100644 --- a/ProjectOptions.cmake +++ b/ProjectOptions.cmake @@ -3,7 +3,7 @@ include(CMakeDependentOption) include(CheckCXXCompilerFlag) -macro(patatocs_supports_sanitizers) +macro(zephyr_supports_sanitizers) if((CMAKE_CXX_COMPILER_ID MATCHES ".*Clang.*" OR CMAKE_CXX_COMPILER_ID MATCHES ".*GNU.*") AND NOT WIN32) set(SUPPORTS_UBSAN ON) else() @@ -17,174 +17,174 @@ macro(patatocs_supports_sanitizers) endif() endmacro() -macro(patatocs_setup_options) - option(patatocs_ENABLE_HARDENING "Enable hardening" ON) - option(patatocs_ENABLE_COVERAGE "Enable coverage reporting" ON) +macro(zephyr_setup_options) + option(zephyr_ENABLE_HARDENING "Enable hardening" ON) + option(zephyr_ENABLE_COVERAGE "Enable coverage reporting" ON) cmake_dependent_option( - patatocs_ENABLE_GLOBAL_HARDENING + zephyr_ENABLE_GLOBAL_HARDENING "Attempt to push hardening options to built dependencies" ON - patatocs_ENABLE_HARDENING + zephyr_ENABLE_HARDENING OFF) - patatocs_supports_sanitizers() - - if(NOT PROJECT_IS_TOP_LEVEL OR patatocs_PACKAGING_MAINTAINER_MODE) - option(patatocs_ENABLE_IPO "Enable IPO/LTO" OFF) - option(patatocs_WARNINGS_AS_ERRORS "Treat Warnings As Errors" OFF) - option(patatocs_ENABLE_USER_LINKER "Enable user-selected linker" OFF) - option(patatocs_ENABLE_SANITIZER_ADDRESS "Enable address sanitizer" OFF) - option(patatocs_ENABLE_SANITIZER_LEAK "Enable leak sanitizer" OFF) - option(patatocs_ENABLE_SANITIZER_UNDEFINED "Enable undefined sanitizer" OFF) - option(patatocs_ENABLE_SANITIZER_THREAD "Enable thread sanitizer" OFF) - option(patatocs_ENABLE_SANITIZER_MEMORY "Enable memory sanitizer" OFF) - option(patatocs_ENABLE_UNITY_BUILD "Enable unity builds" OFF) - option(patatocs_ENABLE_CLANG_TIDY "Enable clang-tidy" OFF) - option(patatocs_ENABLE_CPPCHECK "Enable cpp-check analysis" OFF) - option(patatocs_ENABLE_PCH "Enable precompiled headers" OFF) - option(patatocs_ENABLE_CACHE "Enable ccache" OFF) + zephyr_supports_sanitizers() + + if(NOT PROJECT_IS_TOP_LEVEL OR zephyr_PACKAGING_MAINTAINER_MODE) + option(zephyr_ENABLE_IPO "Enable IPO/LTO" OFF) + option(zephyr_WARNINGS_AS_ERRORS "Treat Warnings As Errors" OFF) + option(zephyr_ENABLE_USER_LINKER "Enable user-selected linker" OFF) + option(zephyr_ENABLE_SANITIZER_ADDRESS "Enable address sanitizer" OFF) + option(zephyr_ENABLE_SANITIZER_LEAK "Enable leak sanitizer" OFF) + option(zephyr_ENABLE_SANITIZER_UNDEFINED "Enable undefined sanitizer" OFF) + option(zephyr_ENABLE_SANITIZER_THREAD "Enable thread sanitizer" OFF) + option(zephyr_ENABLE_SANITIZER_MEMORY "Enable memory sanitizer" OFF) + option(zephyr_ENABLE_UNITY_BUILD "Enable unity builds" OFF) + option(zephyr_ENABLE_CLANG_TIDY "Enable clang-tidy" OFF) + option(zephyr_ENABLE_CPPCHECK "Enable cpp-check analysis" OFF) + option(zephyr_ENABLE_PCH "Enable precompiled headers" OFF) + option(zephyr_ENABLE_CACHE "Enable ccache" OFF) else() - option(patatocs_ENABLE_IPO "Enable IPO/LTO" ON) - option(patatocs_WARNINGS_AS_ERRORS "Treat Warnings As Errors" OFF) - option(patatocs_ENABLE_USER_LINKER "Enable user-selected linker" OFF) - option(patatocs_ENABLE_SANITIZER_ADDRESS "Enable address sanitizer" ${SUPPORTS_ASAN}) - option(patatocs_ENABLE_SANITIZER_LEAK "Enable leak sanitizer" OFF) - option(patatocs_ENABLE_SANITIZER_UNDEFINED "Enable undefined sanitizer" ${SUPPORTS_UBSAN}) - option(patatocs_ENABLE_SANITIZER_THREAD "Enable thread sanitizer" OFF) - option(patatocs_ENABLE_SANITIZER_MEMORY "Enable memory sanitizer" OFF) - option(patatocs_ENABLE_UNITY_BUILD "Enable unity builds" OFF) - option(patatocs_ENABLE_CLANG_TIDY "Enable clang-tidy" ON) - option(patatocs_ENABLE_CPPCHECK "Enable cpp-check analysis" ON) - option(patatocs_ENABLE_PCH "Enable precompiled headers" OFF) - option(patatocs_ENABLE_CACHE "Enable ccache" ON) + option(zephyr_ENABLE_IPO "Enable IPO/LTO" ON) + option(zephyr_WARNINGS_AS_ERRORS "Treat Warnings As Errors" OFF) + option(zephyr_ENABLE_USER_LINKER "Enable user-selected linker" OFF) + option(zephyr_ENABLE_SANITIZER_ADDRESS "Enable address sanitizer" ${SUPPORTS_ASAN}) + option(zephyr_ENABLE_SANITIZER_LEAK "Enable leak sanitizer" OFF) + option(zephyr_ENABLE_SANITIZER_UNDEFINED "Enable undefined sanitizer" ${SUPPORTS_UBSAN}) + option(zephyr_ENABLE_SANITIZER_THREAD "Enable thread sanitizer" OFF) + option(zephyr_ENABLE_SANITIZER_MEMORY "Enable memory sanitizer" OFF) + option(zephyr_ENABLE_UNITY_BUILD "Enable unity builds" OFF) + option(zephyr_ENABLE_CLANG_TIDY "Enable clang-tidy" ON) + option(zephyr_ENABLE_CPPCHECK "Enable cpp-check analysis" ON) + option(zephyr_ENABLE_PCH "Enable precompiled headers" OFF) + option(zephyr_ENABLE_CACHE "Enable ccache" ON) endif() if(NOT PROJECT_IS_TOP_LEVEL) mark_as_advanced( - patatocs_ENABLE_IPO - patatocs_WARNINGS_AS_ERRORS - patatocs_ENABLE_USER_LINKER - patatocs_ENABLE_SANITIZER_ADDRESS - patatocs_ENABLE_SANITIZER_LEAK - patatocs_ENABLE_SANITIZER_UNDEFINED - patatocs_ENABLE_SANITIZER_THREAD - patatocs_ENABLE_SANITIZER_MEMORY - patatocs_ENABLE_UNITY_BUILD - patatocs_ENABLE_CLANG_TIDY - patatocs_ENABLE_CPPCHECK - patatocs_ENABLE_COVERAGE - patatocs_ENABLE_PCH - patatocs_ENABLE_CACHE) + zephyr_ENABLE_IPO + zephyr_WARNINGS_AS_ERRORS + zephyr_ENABLE_USER_LINKER + zephyr_ENABLE_SANITIZER_ADDRESS + zephyr_ENABLE_SANITIZER_LEAK + zephyr_ENABLE_SANITIZER_UNDEFINED + zephyr_ENABLE_SANITIZER_THREAD + zephyr_ENABLE_SANITIZER_MEMORY + zephyr_ENABLE_UNITY_BUILD + zephyr_ENABLE_CLANG_TIDY + zephyr_ENABLE_CPPCHECK + zephyr_ENABLE_COVERAGE + zephyr_ENABLE_PCH + zephyr_ENABLE_CACHE) endif() endmacro() -macro(patatocs_global_options) - if(patatocs_ENABLE_IPO) +macro(zephyr_global_options) + if(zephyr_ENABLE_IPO) include(cmake/InterproceduralOptimization.cmake) - patatocs_enable_ipo() + zephyr_enable_ipo() endif() - patatocs_supports_sanitizers() + zephyr_supports_sanitizers() - if(patatocs_ENABLE_HARDENING AND patatocs_ENABLE_GLOBAL_HARDENING) + if(zephyr_ENABLE_HARDENING AND zephyr_ENABLE_GLOBAL_HARDENING) include(cmake/Hardening.cmake) if(NOT SUPPORTS_UBSAN - OR patatocs_ENABLE_SANITIZER_UNDEFINED - OR patatocs_ENABLE_SANITIZER_ADDRESS - OR patatocs_ENABLE_SANITIZER_THREAD - OR patatocs_ENABLE_SANITIZER_LEAK) + OR zephyr_ENABLE_SANITIZER_UNDEFINED + OR zephyr_ENABLE_SANITIZER_ADDRESS + OR zephyr_ENABLE_SANITIZER_THREAD + OR zephyr_ENABLE_SANITIZER_LEAK) set(ENABLE_UBSAN_MINIMAL_RUNTIME FALSE) else() set(ENABLE_UBSAN_MINIMAL_RUNTIME TRUE) endif() - message("${patatocs_ENABLE_HARDENING} ${ENABLE_UBSAN_MINIMAL_RUNTIME} ${patatocs_ENABLE_SANITIZER_UNDEFINED}") - patatocs_enable_hardening(patatocs_options ON ${ENABLE_UBSAN_MINIMAL_RUNTIME}) + message("${zephyr_ENABLE_HARDENING} ${ENABLE_UBSAN_MINIMAL_RUNTIME} ${zephyr_ENABLE_SANITIZER_UNDEFINED}") + zephyr_enable_hardening(zephyr_options ON ${ENABLE_UBSAN_MINIMAL_RUNTIME}) endif() endmacro() -macro(patatocs_local_options) +macro(zephyr_local_options) if(PROJECT_IS_TOP_LEVEL) include(cmake/StandardProjectSettings.cmake) endif() - add_library(patatocs_warnings INTERFACE) - add_library(patatocs_options INTERFACE) + add_library(zephyr_warnings INTERFACE) + add_library(zephyr_options INTERFACE) include(cmake/CompilerWarnings.cmake) - patatocs_set_project_warnings( - patatocs_warnings - ${patatocs_WARNINGS_AS_ERRORS} + zephyr_set_project_warnings( + zephyr_warnings + ${zephyr_WARNINGS_AS_ERRORS} "" "" "" "") - if(patatocs_ENABLE_USER_LINKER) + if(zephyr_ENABLE_USER_LINKER) include(cmake/Linker.cmake) - configure_linker(patatocs_options) + configure_linker(zephyr_options) endif() include(cmake/Sanitizers.cmake) - patatocs_enable_sanitizers( - patatocs_options - ${patatocs_ENABLE_SANITIZER_ADDRESS} - ${patatocs_ENABLE_SANITIZER_LEAK} - ${patatocs_ENABLE_SANITIZER_UNDEFINED} - ${patatocs_ENABLE_SANITIZER_THREAD} - ${patatocs_ENABLE_SANITIZER_MEMORY}) + zephyr_enable_sanitizers( + zephyr_options + ${zephyr_ENABLE_SANITIZER_ADDRESS} + ${zephyr_ENABLE_SANITIZER_LEAK} + ${zephyr_ENABLE_SANITIZER_UNDEFINED} + ${zephyr_ENABLE_SANITIZER_THREAD} + ${zephyr_ENABLE_SANITIZER_MEMORY}) - set_target_properties(patatocs_options PROPERTIES UNITY_BUILD ${patatocs_ENABLE_UNITY_BUILD}) + set_target_properties(zephyr_options PROPERTIES UNITY_BUILD ${zephyr_ENABLE_UNITY_BUILD}) - if(patatocs_ENABLE_PCH) + if(zephyr_ENABLE_PCH) target_precompile_headers( - patatocs_options + zephyr_options INTERFACE ) endif() - if(patatocs_ENABLE_CACHE) + if(zephyr_ENABLE_CACHE) include(cmake/Cache.cmake) - patatocs_enable_cache() + zephyr_enable_cache() endif() include(cmake/StaticAnalyzers.cmake) - if(patatocs_ENABLE_CLANG_TIDY) - patatocs_enable_clang_tidy(patatocs_options ${patatocs_WARNINGS_AS_ERRORS}) + if(zephyr_ENABLE_CLANG_TIDY) + zephyr_enable_clang_tidy(zephyr_options ${zephyr_WARNINGS_AS_ERRORS}) endif() - if(patatocs_ENABLE_CPPCHECK) - patatocs_enable_cppcheck(${patatocs_WARNINGS_AS_ERRORS} "" # override cppcheck options + if(zephyr_ENABLE_CPPCHECK) + zephyr_enable_cppcheck(${zephyr_WARNINGS_AS_ERRORS} "" # override cppcheck options ) endif() - if(patatocs_ENABLE_COVERAGE) + if(zephyr_ENABLE_COVERAGE) include(cmake/Tests.cmake) - patatocs_enable_coverage(patatocs_options) + zephyr_enable_coverage(zephyr_options) endif() - if(patatocs_WARNINGS_AS_ERRORS) + if(zephyr_WARNINGS_AS_ERRORS) check_cxx_compiler_flag("-Wl,--fatal-warnings" LINKER_FATAL_WARNINGS) if(LINKER_FATAL_WARNINGS) # This is not working consistently, so disabling for now - # target_link_options(patatocs_options INTERFACE -Wl,--fatal-warnings) + # target_link_options(zephyr_options INTERFACE -Wl,--fatal-warnings) endif() endif() - if(patatocs_ENABLE_HARDENING AND NOT patatocs_ENABLE_GLOBAL_HARDENING) + if(zephyr_ENABLE_HARDENING AND NOT zephyr_ENABLE_GLOBAL_HARDENING) include(cmake/Hardening.cmake) if(NOT SUPPORTS_UBSAN - OR patatocs_ENABLE_SANITIZER_UNDEFINED - OR patatocs_ENABLE_SANITIZER_ADDRESS - OR patatocs_ENABLE_SANITIZER_THREAD - OR patatocs_ENABLE_SANITIZER_LEAK) + OR zephyr_ENABLE_SANITIZER_UNDEFINED + OR zephyr_ENABLE_SANITIZER_ADDRESS + OR zephyr_ENABLE_SANITIZER_THREAD + OR zephyr_ENABLE_SANITIZER_LEAK) set(ENABLE_UBSAN_MINIMAL_RUNTIME FALSE) else() set(ENABLE_UBSAN_MINIMAL_RUNTIME TRUE) endif() - patatocs_enable_hardening(patatocs_options OFF ${ENABLE_UBSAN_MINIMAL_RUNTIME}) + zephyr_enable_hardening(zephyr_options OFF ${ENABLE_UBSAN_MINIMAL_RUNTIME}) endif() endmacro() diff --git a/cmake/Cache.cmake b/cmake/Cache.cmake index ff71d43..bba3694 100644 --- a/cmake/Cache.cmake +++ b/cmake/Cache.cmake @@ -1,5 +1,5 @@ # Enable cache if available -function(patatocs_enable_cache) +function(zephyr_enable_cache) set(CACHE_OPTION "ccache" CACHE STRING "Compiler cache to be used") diff --git a/cmake/CompilerWarnings.cmake b/cmake/CompilerWarnings.cmake index e42dd8d..a63e7ec 100644 --- a/cmake/CompilerWarnings.cmake +++ b/cmake/CompilerWarnings.cmake @@ -3,7 +3,7 @@ # https://github.com/lefticus/cppbestpractices/blob/master/02-Use_the_Tools_Available.md function( - patatocs_set_project_warnings + zephyr_set_project_warnings project_name WARNINGS_AS_ERRORS MSVC_WARNINGS diff --git a/cmake/Cuda.cmake b/cmake/Cuda.cmake index 5295cf5..e796284 100644 --- a/cmake/Cuda.cmake +++ b/cmake/Cuda.cmake @@ -7,7 +7,7 @@ # target_link_libraries(main_cuda PRIVATE project_options project_warnings) # target_link_cuda(main_cuda) # -macro(patatocs_target_link_cuda target) +macro(zephyr_target_link_cuda target) # optional named CUDA_WARNINGS set(oneValueArgs CUDA_WARNINGS) cmake_parse_arguments( diff --git a/cmake/Doxygen.cmake b/cmake/Doxygen.cmake index cabb698..ce1d006 100644 --- a/cmake/Doxygen.cmake +++ b/cmake/Doxygen.cmake @@ -1,5 +1,5 @@ # Enable doxygen doc builds of source -function(patatocs_enable_doxygen DOXYGEN_THEME) +function(zephyr_enable_doxygen DOXYGEN_THEME) # If not specified, use the top readme file as the first page if((NOT DOXYGEN_USE_MDFILE_AS_MAINPAGE) AND EXISTS "${PROJECT_SOURCE_DIR}/README.md") set(DOXYGEN_USE_MDFILE_AS_MAINPAGE "${PROJECT_SOURCE_DIR}/README.md") diff --git a/cmake/Hardening.cmake b/cmake/Hardening.cmake index e5b6b3b..f3e4b38 100644 --- a/cmake/Hardening.cmake +++ b/cmake/Hardening.cmake @@ -1,7 +1,7 @@ include(CheckCXXCompilerFlag) macro( - patatocs_enable_hardening + zephyr_enable_hardening target global ubsan_minimal_runtime) diff --git a/cmake/InterproceduralOptimization.cmake b/cmake/InterproceduralOptimization.cmake index f369eca..9ae859e 100644 --- a/cmake/InterproceduralOptimization.cmake +++ b/cmake/InterproceduralOptimization.cmake @@ -1,4 +1,4 @@ -macro(patatocs_enable_ipo) +macro(zephyr_enable_ipo) include(CheckIPOSupported) check_ipo_supported(RESULT result OUTPUT output) if(result) diff --git a/cmake/Linker.cmake b/cmake/Linker.cmake index 63eb099..7e7f92a 100644 --- a/cmake/Linker.cmake +++ b/cmake/Linker.cmake @@ -1,4 +1,4 @@ -macro(patatocs_configure_linker project_name) +macro(zephyr_configure_linker project_name) include(CheckCXXCompilerFlag) set(USER_LINKER_OPTION diff --git a/cmake/PackageProject.cmake b/cmake/PackageProject.cmake index f03285d..11956a3 100644 --- a/cmake/PackageProject.cmake +++ b/cmake/PackageProject.cmake @@ -1,7 +1,7 @@ # Uses ycm (permissive BSD-3-Clause license) and ForwardArguments (permissive MIT license) cmake_policy(SET CMP0135 NEW) -function(patatocs_package_project) +function(zephyr_package_project) cmake_policy(SET CMP0103 NEW) # disallow multiple calls with the same NAME set(_options ARCH_INDEPENDENT # default to false diff --git a/cmake/PreventInSourceBuilds.cmake b/cmake/PreventInSourceBuilds.cmake index 0cb92c1..1f9c494 100644 --- a/cmake/PreventInSourceBuilds.cmake +++ b/cmake/PreventInSourceBuilds.cmake @@ -1,7 +1,7 @@ # # This function will prevent in-source builds # -function(patatocs_assure_out_of_source_builds) +function(zephyr_assure_out_of_source_builds) # make sure the user doesn't play dirty with symlinks get_filename_component(srcdir "${CMAKE_SOURCE_DIR}" REALPATH) get_filename_component(bindir "${CMAKE_BINARY_DIR}" REALPATH) @@ -16,4 +16,4 @@ function(patatocs_assure_out_of_source_builds) endif() endfunction() -patatocs_assure_out_of_source_builds() +zephyr_assure_out_of_source_builds() diff --git a/cmake/Sanitizers.cmake b/cmake/Sanitizers.cmake index d25eb3f..b11ecc9 100644 --- a/cmake/Sanitizers.cmake +++ b/cmake/Sanitizers.cmake @@ -1,5 +1,5 @@ function( - patatocs_enable_sanitizers + zephyr_enable_sanitizers project_name ENABLE_SANITIZER_ADDRESS ENABLE_SANITIZER_LEAK diff --git a/cmake/StaticAnalyzers.cmake b/cmake/StaticAnalyzers.cmake index 7f5e96c..e9e20b2 100644 --- a/cmake/StaticAnalyzers.cmake +++ b/cmake/StaticAnalyzers.cmake @@ -1,4 +1,4 @@ -macro(patatocs_enable_cppcheck WARNINGS_AS_ERRORS CPPCHECK_OPTIONS) +macro(zephyr_enable_cppcheck WARNINGS_AS_ERRORS CPPCHECK_OPTIONS) find_program(CPPCHECK cppcheck) if(CPPCHECK) @@ -46,7 +46,7 @@ macro(patatocs_enable_cppcheck WARNINGS_AS_ERRORS CPPCHECK_OPTIONS) endif() endmacro() -macro(patatocs_enable_clang_tidy target WARNINGS_AS_ERRORS) +macro(zephyr_enable_clang_tidy target WARNINGS_AS_ERRORS) find_program(CLANGTIDY clang-tidy) if(CLANGTIDY) @@ -99,7 +99,7 @@ macro(patatocs_enable_clang_tidy target WARNINGS_AS_ERRORS) endif() endmacro() -macro(patatocs_enable_include_what_you_use) +macro(zephyr_enable_include_what_you_use) find_program(INCLUDE_WHAT_YOU_USE include-what-you-use) if(INCLUDE_WHAT_YOU_USE) set(CMAKE_CXX_INCLUDE_WHAT_YOU_USE ${INCLUDE_WHAT_YOU_USE}) diff --git a/cmake/Tests.cmake b/cmake/Tests.cmake index 0114cd4..b373a25 100644 --- a/cmake/Tests.cmake +++ b/cmake/Tests.cmake @@ -1,4 +1,4 @@ -function(patatocs_enable_coverage project_name) +function(zephyr_enable_coverage project_name) if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES ".*Clang") target_compile_options(${project_name} INTERFACE --coverage -O0 -g) target_link_libraries(${project_name} INTERFACE --coverage) diff --git a/doxyfile b/doxyfile index 02a23ca..b9acef0 100644 --- a/doxyfile +++ b/doxyfile @@ -913,7 +913,7 @@ WARN_LOGFILE = # The INPUT tag is used to specify the files and/or directories that contain # documented source files. You may enter file names like myfile.cpp or -# directories like /usr/src/patatocs. Separate the files or directories with +# directories like /usr/src/zephyr. Separate the files or directories with # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING # Note: If this tag is empty the current directory is searched. diff --git a/libapi.so b/libapi.so deleted file mode 100755 index 82de59d..0000000 Binary files a/libapi.so and /dev/null differ diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 46c4120..71de80d 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -9,9 +9,9 @@ set(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage") if(PROJECT_IS_TOP_LEVEL OR TEST_INSTALLED_VERSION) enable_testing() - find_package(patatocs CONFIG REQUIRED) # for intro, project_options, ... + find_package(zephyr CONFIG REQUIRED) # for intro, project_options, ... - if(NOT TARGET patatocs_options) + if(NOT TARGET zephyr_options) message(FATAL_ERROR "Requiered config package not found!") return() # be strictly paranoid for Template Janitor github action! CK endif() @@ -31,10 +31,10 @@ add_executable(tests target_link_libraries( tests - PRIVATE patatocs::patatocs_warnings - patatocs::patatocs_options + PRIVATE zephyr::zephyr_warnings + zephyr::zephyr_options Catch2::Catch2WithMain - patatocs + zephyr ) if(WIN32 AND BUILD_SHARED_LIBS)