8000 Merge. by wilx · Pull Request #522 · log4cplus/log4cplus · GitHub
[go: up one dir, main page]
Skip to content

Merge. #522

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Aug 15, 2021
Merged

Merge. #522

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
917b5c4
`filename` should not be empty for TimeBasedRollingFileAppender
foxhlchen Jul 15, 2021
3c0e312
Add CMake alias libraries. Fixes #511.
wilx Aug 15, 2021
eecfa06
Update Catch2 to v2.13.7. Fixes #519.
wilx Aug 9, 2021
fc034d5
Clear files before the MaxHistory #381
zcteo Jul 6, 2021
7ac6fbc
Update ThreadPool implementation.
wilx Feb 24, 2021
69ed899
Merge remote-tracking branch 'github-log4cplus-log4cplus/master'
wilx Aug 15, 2021
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
Prev Previous commit
Next Next commit
Add CMake alias libraries. Fixes #511.
  • Loading branch information
@wilx
wilx committed Aug 15, 2021
commit 3c0e312595066670733ffa0f1cfb576491b5a7a9
1 change: 1 addition & 0 deletions qt4debugappender/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ include (${QT_USE_FILE})

set (qt4debugappender log4cplusqt4debugappender${log4cplus_postfix})
add_library (${qt4debugappender} ${qt4debugappender_sources})
add_library (log4cplus::qt4debugappender ALIAS ${qt4debugappender})
if (UNICODE)
target_compile_definitions (${qt4debugappender} PUBLIC UNICODE)
target_compile_definitions (${qt4debugappender} PUBLIC _UNICODE)
Expand Down
1 change: 1 addition & 0 deletions qt5debugappender/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ find_package (Qt5Core REQUIRED)

set (qt5debugappender log4cplusqt5debugappender${log4cplus_postfix})
add_library (${qt5debugappender} ${qt5debugappender_sources})
add_library (log4cplus::qt5debugappender ALIAS ${qt5debugappender})
if (UNICODE)
target_compile_definitions (${qt5debugappender} PUBLIC UNICODE)
target_compile_definitions (${qt5debugappender} PUBLIC _UNICODE)
Expand Down
1 change: 1 addition & 0 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ if (WIN32)
endif (WIN32)

add_library (${log4cplus} ${log4cplus_sources})
add_library (log4cplus::log4cplus ALIAS ${log4cplus})

if (UNICODE)
target_compile_definitions (${log4cplus} PUBLIC UNICODE)
Expand Down
0