Skip to content
Closed
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 0 additions & 26 deletions ports/arcus/0001-fix-protobuf-deprecated.patch

This file was deleted.

226 changes: 226 additions & 0 deletions ports/arcus/0001-standardprojectsettings.patch
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Original file line number Diff line number Diff line change
@@ -0,0 +1,226 @@
diff --git a/CMake/StandardProjectSettings.cmake b/CMake/StandardProjectSettings.cmake
new file mode 100644
index 0000000..59fcdfd
--- /dev/null
+++ b/CMake/StandardProjectSettings.cmake
@@ -0,0 +1,220 @@
+include(GNUInstallDirs) # Standard install dirs
+
+# Generate compile_commands.json to make it easier to work with clang based tools
+message(STATUS "Generating compile commands to ${CMAKE_CURRENT_BINARY_DIR}/compile_commands.json")
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+
+# Ultimaker uniform Thread linking method
+function(use_threads project_name)
+ message(STATUS "Enabling threading support for ${project_name}")
+ set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
+ set(THREADS_PREFER_PTHREAD_FLAG TRUE)
+ find_package(Threads)
+ get_target_property(type ${project_name} TYPE)
+ if(CMAKE_USE_PTHREADS_INIT AND UNIX AND NOT APPLE)
+ target_link_libraries(Threads::Threads INTERFACE -pthread)
+ endif()
+ if (${type} STREQUAL "INTERFACE_LIBRARY")
+ target_link_libraries(${project_name} INTERFACE Threads::Threads)
+ else()
+ target_link_libraries(${project_name} PRIVATE Threads::Threads)
+ endif()
+endfunction()
+
+# https://github.com/lefticus/cppbestpractices/blob/master/02-Use_the_Tools_Available.md
+function(set_project_warnings project_name)
+ message(STATUS "Setting warnings for ${project_name}")
+ set(MSVC_WARNINGS
+ /W4 # Baseline reasonable warnings
+ /w14242 # 'identifier': conversion from 'type1' to 'type1', possible loss of data
+ /w14254 # 'operator': conversion from 'type1:field_bits' to 'type2:field_bits', possible loss of data
+ /w14263 # 'function': member function does not override any base class virtual member function
+ /w14265 # 'classname': class has virtual functions, but destructor is not virtual instances of this class may not
+ # be destructed correctly
+ /w14287 # 'operator': unsigned/negative constant mismatch
+ /we4289 # nonstandard extension used: 'variable': loop control variable declared in the for-loop is used outside
+ # the for-loop scope
+ /w14296 # 'operator': expression is always 'boolean_value'
+ /w14311 # 'variable': pointer truncation from 'type1' to 'type2'
+ /w14545 # expression before comma evaluates to a function which is missing an argument list
+ /w14546 # function call before comma missing argument list
+ /w14547 # 'operator': operator before comma has no effect; expected operator with side-effect
+ /w14549 # 'operator': operator before comma has no effect; did you intend 'operator'?
+ /w14555 # expression has no effect; expected expression with side- effect
+ /w14619 # pragma warning: there is no warning number 'number'
+ /w14640 # Enable warning on thread un-safe static member initialization
+ /w14826 # Conversion from 'type1' to 'type_2' is sign-extended. This may cause unexpected runtime behavior.
+ /w14905 # wide string literal cast to 'LPSTR'
+ /w14906 # string literal cast to 'LPWSTR'
+ /w14928 # illegal copy-initialization; more than one user-defined conversion has been implicitly applied
+ /permissive- # standards conformance mode for MSVC compiler.
+ )
+
+ set(CLANG_WARNINGS
+ -Wall
+ -Wextra # reasonable and standard
+ -Wshadow # warn the user if a variable declaration shadows one from a parent context
+ -Wnon-virtual-dtor # warn the user if a class with virtual functions has a non-virtual destructor. This helps
+ # catch hard to track down memory errors
+ -Wold-style-cast # warn for c-style casts
+ -Wcast-align # warn for potential performance problem casts
+ -Wunused # warn on anything being unused
+ -Woverloaded-virtual # warn if you overload (not override) a virtual function
+ -Wpedantic # warn if non-standard C++ is used
+ -Wconversion # warn on type conversions that may lose data
+ -Wsign-conversion # warn on sign conversions
+ -Wnull-dereference # warn if a null dereference is detected
+ -Wdouble-promotion # warn if float is implicit promoted to double
+ -Wformat=2 # warn on security issues around functions that format output (ie printf)
+ )
+
+ set(GCC_WARNINGS
+ ${CLANG_WARNINGS}
+ -Wmisleading-indentation # warn if indentation implies blocks where blocks do not exist
+ -Wduplicated-cond # warn if if / else chain has duplicated conditions
+ -Wduplicated-branches # warn if if / else branches have duplicated code
+ -Wlogical-op # warn about logical operations being used where bitwise were probably wanted
+ -Wuseless-cast # warn if you perform a cast to the same type
+ )
+
+ if(MSVC)
+ set(PROJECT_WARNINGS ${MSVC_WARNINGS})
+ elseif(CMAKE_CXX_COMPILER_ID MATCHES ".*Clang")
+ set(PROJECT_WARNINGS ${CLANG_WARNINGS})
+ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+ set(PROJECT_WARNINGS ${GCC_WARNINGS})
+ else()
+ message(AUTHOR_WARNING "No compiler warnings set for '${CMAKE_CXX_COMPILER_ID}' compiler.")
+ endif()
+
+ get_target_property(type ${project_name} TYPE)
+ if (${type} STREQUAL "INTERFACE_LIBRARY")
+ target_compile_options(${project_name} INTERFACE ${PROJECT_WARNINGS})
+ else()
+ target_compile_options(${project_name} PRIVATE ${PROJECT_WARNINGS})
+ endif()
+endfunction()
+
+# This function will prevent in-source builds
+function(AssureOutOfSourceBuilds)
+ # 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)
+
+ # disallow in-source builds
+ if("${srcdir}" STREQUAL "${bindir}")
+ message("######################################################")
+ message("Warning: in-source builds are disabled")
+ message("Please create a separate build directory and run cmake from there")
+ message("######################################################")
+ message(FATAL_ERROR "Quitting configuration")
+ endif()
+endfunction()
+
+function(enable_sanitizers project_name)
+
+ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES ".*Clang")
+ option(ENABLE_COVERAGE "Enable coverage reporting for gcc/clang" FALSE)
+
+ if(ENABLE_COVERAGE)
+ target_compile_options(${project_name} INTERFACE --coverage -O0 -g)
+ target_link_libraries(${project_name} INTERFACE --coverage)
+ endif()
+
+ set(SANITIZERS "")
+
+ option(ENABLE_SANITIZER_ADDRESS "Enable address sanitizer" FALSE)
+ if(ENABLE_SANITIZER_ADDRESS)
+ list(APPEND SANITIZERS "address")
+ endif()
+
+ option(ENABLE_SANITIZER_LEAK "Enable leak sanitizer" FALSE)
+ if(ENABLE_SANITIZER_LEAK)
+ list(APPEND SANITIZERS "leak")
+ endif()
+
+ option(ENABLE_SANITIZER_UNDEFINED_BEHAVIOR "Enable undefined behavior sanitizer" FALSE)
+ if(ENABLE_SANITIZER_UNDEFINED_BEHAVIOR)
+ list(APPEND SANITIZERS "undefined")
+ endif()
+
+ option(ENABLE_SANITIZER_THREAD "Enable thread sanitizer" FALSE)
+ if(ENABLE_SANITIZER_THREAD)
+ if("address" IN_LIST SANITIZERS OR "leak" IN_LIST SANITIZERS)
+ message(WARNING "Thread sanitizer does not work with Address and Leak sanitizer enabled")
+ else()
+ list(APPEND SANITIZERS "thread")
+ endif()
+ endif()
+
+ option(ENABLE_SANITIZER_MEMORY "Enable memory sanitizer" FALSE)
+ if(ENABLE_SANITIZER_MEMORY AND CMAKE_CXX_COMPILER_ID MATCHES ".*Clang")
+ if("address" IN_LIST SANITIZERS
+ OR "thread" IN_LIST SANITIZERS
+ OR "leak" IN_LIST SANITIZERS)
+ message(WARNING "Memory sanitizer does not work with Address, Thread and Leak sanitizer enabled")
+ else()
+ list(APPEND SANITIZERS "memory")
+ endif()
+ endif()
+
+ list(
+ JOIN
+ SANITIZERS
+ ","
+ LIST_OF_SANITIZERS)
+
+ endif()
+
+ if(LIST_OF_SANITIZERS)
+ if(NOT
+ "${LIST_OF_SANITIZERS}"
+ STREQUAL
+ "")
+ target_compile_options(${project_name} INTERFACE -fsanitize=${LIST_OF_SANITIZERS})
+ target_link_options(${project_name} INTERFACE -fsanitize=${LIST_OF_SANITIZERS})
+ endif()
+ endif()
+
+endfunction()
+
+option(ENABLE_CPPCHECK "Enable static analysis with cppcheck" OFF)
+option(ENABLE_CLANG_TIDY "Enable static analysis with clang-tidy" OFF)
+option(ENABLE_INCLUDE_WHAT_YOU_USE "Enable static analysis with include-what-you-use" OFF)
+
+if(ENABLE_CPPCHECK)
+ find_program(CPPCHECK cppcheck)
+ if(CPPCHECK)
+ message(STATUS "Using cppcheck")
+ set(CMAKE_CXX_CPPCHECK
+ ${CPPCHECK}
+ --suppress=missingInclude
+ --enable=all
+ --inline-suppr
+ --inconclusive
+ -i
+ ${CMAKE_SOURCE_DIR}/imgui/lib)
+ else()
+ message(WARNING "cppcheck requested but executable not found")
+ endif()
+endif()
+
+if(ENABLE_CLANG_TIDY)
+ find_program(CLANGTIDY clang-tidy)
+ if(CLANGTIDY)
+ message(STATUS "Using clang-tidy")
+ set(CMAKE_CXX_CLANG_TIDY ${CLANGTIDY} -extra-arg=-Wno-unknown-warning-option)
+ else()
+ message(WARNING "clang-tidy requested but executable not found")
+ endif()
+endif()
+
+if(ENABLE_INCLUDE_WHAT_YOU_USE)
+ find_program(INCLUDE_WHAT_YOU_USE include-what-you-use)
+ if(INCLUDE_WHAT_YOU_USE)
+ message(STATUS "Using include-what-you-use")
+ set(CMAKE_CXX_INCLUDE_WHAT_YOU_USE ${INCLUDE_WHAT_YOU_USE})
+ else()
+ message(WARNING "include-what-you-use requested but executable not found")
+ endif()
+endif()
37 changes: 0 additions & 37 deletions ports/arcus/0002-protobuf-version.patch

This file was deleted.

7 changes: 3 additions & 4 deletions ports/arcus/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,8 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Ultimaker/libArcus
REF ${VERSION}
SHA512 452c541360d74a8f58ab1b20df59efd36756812a9ecd09804ba16877956fb240d367bd968271a9c010496598ef0b459f62aa287553d4ba3fdb4cd2742c25553f
SHA512 8106bbcd595921d56e39bf694fbee43c6146a9c661edf9fb1fe271bbcf199a202e399cfbda5b83711c9daad1c55d8242ba23ce4fb52c416ddd862fb6de2bcab3
HEAD_REF main
PATCHES
0001-fix-protobuf-deprecated.patch
0002-protobuf-version.patch
)

string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ENABLE_STATIC)
Expand All @@ -17,6 +14,8 @@ vcpkg_cmake_configure(
-DBUILD_PYTHON=OFF
-DBUILD_EXAMPLES=OFF
-DBUILD_STATIC=${ENABLE_STATIC}
PATCHES
0001-standardprojectsettings.patch
)

vcpkg_cmake_install()
Expand Down
3 changes: 1 addition & 2 deletions ports/arcus/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "arcus",
"version-semver": "4.10.0",
"port-version": 4,
"version-semver": "5.3.0",
"description": "This library contains C++ bindings for creating a socket in a thread and using this socket to send and receive messages based on the Protocol Buffers library.",
"homepage": "https://github.com/Ultimaker/libArcus",
"supports": "!uwp",
Expand Down
5 changes: 5 additions & 0 deletions versions/a-/arcus.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "d862dce9a414320f46731f96f157ac6068059c8f",
"version-semver": "5.3.0",
"port-version": 0
},
{
"git-tree": "2b141efb5eac8763acdbb6e486c018a2393b4486",
"version-semver": "4.10.0",
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -205,8 +205,8 @@
"port-version": 0
},
"arcus": {
"baseline": "4.10.0",
"port-version": 4
"baseline": "5.3.0",
"port-version": 0
},
"arg-router": {
"baseline": "1.4.0",
Expand Down
Loading