From 6c09217d0a3108957377deb5e9ffc8c8f73b8efd Mon Sep 17 00:00:00 2001 From: Glassalo Date: Mon, 15 Jan 2024 10:19:21 +0100 Subject: [PATCH 1/2] Changed PatatOCS to Zephyr --- .github/constants.env | 2 +- .gitignore | 4 +- CMakeLists.txt | 28 ++-- Dependencies.cmake | 2 +- ProjectOptions.cmake | 188 ++++++++++++------------ cmake/Cache.cmake | 2 +- cmake/CompilerWarnings.cmake | 2 +- cmake/Cuda.cmake | 2 +- cmake/Doxygen.cmake | 2 +- cmake/Hardening.cmake | 2 +- cmake/InterproceduralOptimization.cmake | 2 +- cmake/Linker.cmake | 2 +- cmake/PackageProject.cmake | 2 +- cmake/PreventInSourceBuilds.cmake | 4 +- cmake/Sanitizers.cmake | 2 +- cmake/StaticAnalyzers.cmake | 6 +- cmake/Tests.cmake | 2 +- doxyfile | 2 +- libapi.so | Bin 34296 -> 0 bytes test/CMakeLists.txt | 10 +- 20 files changed, 133 insertions(+), 133 deletions(-) delete mode 100755 libapi.so 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 82de59dc247a8a6eb257eed870ecff62c3af8c1d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 34296 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 YvQL$(1o4_GY5oJZN{NY<3>MV*9|cu3qyPW_ 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) From 2853d29df5cd7c41c414b8bf5907d7e1f774880f Mon Sep 17 00:00:00 2001 From: Pierre Berthe Date: Mon, 15 Jan 2024 10:31:19 +0100 Subject: [PATCH 2/2] Add support for installing boost library using dnf package manager --- scripts/linux.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/linux.sh b/scripts/linux.sh index 445ae95..3c13103 100755 --- a/scripts/linux.sh +++ b/scripts/linux.sh @@ -3,8 +3,10 @@ # get package manager if [ -x "$(command -v apt-get)" ]; then sudo apt-get install -y libboost-all-dev -elif [ -x "$(command -v pacman)" ]; then + elif [ -x "$(command -v pacman)" ]; then sudo pacman -S --noconfirm boost + elif [ -x "$(command -v dnf)" ]; then + sudo dnf install -y boost-devel else echo "No package manager found. Exiting." exit 1