Commit 1fef0a4e authored by Thomas Braun's avatar Thomas Braun
Browse files

log4tango: Integrate it into the main hierarchy 

This allows us to use all helpers in cppTango in a future commit. And also
makes it clear that log4tango is not separate anymore.
parent 8c2a5037

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -373,7 +373,7 @@ clang-tidy: 
    - set -o pipefail

    - >

      ${RUN_CLANG_TIDY}

      -p build -header-filter='.*' -config-file=ci/report.clang-tidy 'src' 'log4tango/src' 'tests/catch2*'

      -p build -header-filter='.*' -config-file=ci/report.clang-tidy 'src' 'tests/catch2*'

      > clang-tidy-output.txt

  after_script:

    - set +o pipefail

.pre-commit-config.yaml

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ repos: 
    - id: check_unsafe_number_parsing

      name: Check that no unsafe string number conversion routines are used

      types_or: [c++, c]

      exclude: '(src/common/parse\.cpp)|(log4tango/src/Level\.cpp)'

      exclude: '(src/common/parse\.cpp)|(src/log4tango/Level\.cpp)'

      args: [--multiline]

      entry: "(ato(i|l|ll|f)|strto(l|ll|ul|ull|f|d|ld)|strtoimax|strtoumax|sto(i|l|ll))"

      language: pygrep

CMakeLists.txt

+0 −4
Original line number Diff line number Diff line
@@ -107,8 +107,6 @@ endif() 
# multi process compilation

add_compile_options($<$<CXX_COMPILER_ID:MSVC>:/MP>)



#source code

add_subdirectory("log4tango")

add_subdirectory("src")



if(BUILD_TESTING)
@@ -125,9 +123,7 @@ set_cflags_and_include(tango) 


target_include_directories(tango INTERFACE

    $<BUILD_INTERFACE:${TANGO_SOURCE_DIR}/src/include>

    $<BUILD_INTERFACE:${TANGO_SOURCE_DIR}/log4tango/include>

    $<BUILD_INTERFACE:${TANGO_BINARY_DIR}/src/include>

    $<BUILD_INTERFACE:${TANGO_BINARY_DIR}/log4tango/include>

    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)



target_compile_features(tango INTERFACE cxx_std_17)

DEVELOPING.md

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ Example commands to run clang-tidy on all files (excluding the old tests): 
```

cmake -B build -S . -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_UNITY_BUILD=ON -DCMAKE_UNITY_BUILD_BATCH_SIZE=0

cmake --build build --target idl_source

run-clang-tidy.py -p build -header-filter='.*' 'src' 'log4tango/src' 'tests/catch2*'

run-clang-tidy.py -p build -header-filter='.*' 'src' 'tests/catch2*'

```



# Code style checks

configure/functions.cmake

+0 −2
Original line number Diff line number Diff line
@@ -24,9 +24,7 @@ function(set_cflags_and_include target) 


  target_include_directories(${target} PRIVATE

    ${TANGO_SOURCE_DIR}/src/include

    ${TANGO_SOURCE_DIR}/log4tango/include

    ${TANGO_BINARY_DIR}/src/include

    ${TANGO_BINARY_DIR}/log4tango/include

  )



  if(TANGO_USE_JPEG)