Menu
▾
▴
[Log4cpp-commits] [git push]Log4cpp Git repository. branch master updated. REL_1.1.5rc1_Aug_23_2024-19-gf77a7b1
|
From: <log...@li...> - 2025-11-13 19:58:53
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Log4cpp Git repository.".
The branch, master has been updated
via f77a7b1978c13abc693a3e7e1b376c592abdb259 (commit)
via d91a7ded7bc97b947843b868d8b6ee2f9b6461f0 (commit)
via 7f808086479482e7917b78c0e45fba336c2b8c59 (commit)
from 7a6b6c83f1ce70f99ae39a752ed87e163c8825c4 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceforge.net/p/log4cpp/codegit/ci/
commit f77a7b1978c13abc693a3e7e1b376c592abdb259
Author: Alexander Perepelkin <san...@us...>
Date: Thu Nov 13 20:52:06 2025 +0100
Cmake fixes, add RAD Studio 12 support
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0f00163..1075142 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,7 +24,10 @@ ENDIF ()
IF (WIN32)
SET ( CMAKE_DEBUG_POSTFIX "D" )
- ADD_DEFINITIONS ( -D_CRT_SECURE_NO_WARNINGS -DLOG4CPP_HAS_DLL -DLOG4CPP_BUILD_DLL )
+ ADD_DEFINITIONS ( -DWIN32 )
+ IF ( NOT CMAKE_BUILD_TYPE STREQUAL "Release" )
+ SET ( WIN_DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX} )
+ ENDIF()
ELSE (WIN32)
IF (APPLE)
ADD_DEFINITIONS ( -DLOG4CPP_HAVE_SSTREAM )
@@ -97,7 +100,7 @@ ELSE()
ENDIF ()
ENDIF()
-message("LOG4CPP_BUILD_SHARED is ${LOG4CPP_BUILD_SHARED} LOG4CPP_BUILD_STATIC is ${LOG4CPP_BUILD_STATIC}")
+MESSAGE("LOG4CPP_BUILD_SHARED is ${LOG4CPP_BUILD_SHARED}; LOG4CPP_BUILD_STATIC is ${LOG4CPP_BUILD_STATIC}")
IF (LOG4CPP_BUILD_STATIC)
ADD_LIBRARY ( LOG4CPP_STATIC STATIC ${LOG4CPP_LIBRARY_SOURCES} )
@@ -109,20 +112,31 @@ IF (LOG4CPP_BUILD_STATIC)
ENDIF()
TARGET_COMPILE_DEFINITIONS ( LOG4CPP_STATIC PRIVATE $<$<CONFIG:Debug>:_DEBUG DEBUG LOG4CPP_FIX_ERROR_COLLISION> )
TARGET_COMPILE_DEFINITIONS ( LOG4CPP_STATIC PRIVATE $<$<CONFIG:Release>:NDEBUG> )
-ENDIF ()
+ENDIF (LOG4CPP_BUILD_STATIC)
IF (LOG4CPP_BUILD_SHARED)
ADD_LIBRARY ( LOG4CPP_SHARED SHARED ${LOG4CPP_LIBRARY_SOURCES} )
SET_TARGET_PROPERTIES( LOG4CPP_SHARED PROPERTIES OUTPUT_NAME ${LOG4CPP_LIBRARY_NAME} )
TARGET_COMPILE_DEFINITIONS ( LOG4CPP_SHARED PRIVATE $<$<CONFIG:Debug>:_DEBUG DEBUG LOG4CPP_FIX_ERROR_COLLISION> )
TARGET_COMPILE_DEFINITIONS ( LOG4CPP_SHARED PRIVATE $<$<CONFIG:Release>:NDEBUG> )
-ENDIF ()
+ IF (WIN32)
+ TARGET_COMPILE_DEFINITIONS ( LOG4CPP_SHARED PRIVATE -D_CRT_SECURE_NO_WARNINGS -DLOG4CPP_HAS_DLL -DLOG4CPP_BUILD_DLL )
+ ENDIF (WIN32)
+ENDIF (LOG4CPP_BUILD_SHARED)
IF (WIN32)
- TARGET_LINK_LIBRARIES ( LOG4CPP_STATIC PRIVATE kernel32 user32 ws2_32 advapi32 msvcrt${CMAKE_DEBUG_POSTFIX} )
- SET_TARGET_PROPERTIES ( LOG4CPP_STATIC PROPERTIES LINK_FLAGS /NODEFAULTLIB:msvcrt${CMAKE_DEBUG_POSTFIX} )
- TARGET_LINK_LIBRARIES ( LOG4CPP_SHARED PRIVATE kernel32 user32 ws2_32 advapi32 msvcrt${CMAKE_DEBUG_POSTFIX} )
- SET_TARGET_PROPERTIES ( LOG4CPP_SHARED PROPERTIES LINK_FLAGS /NODEFAULTLIB:msvcrt${CMAKE_DEBUG_POSTFIX} )
+ # RAD Studio specifics
+ IF (CMAKE_CXX_COMPILER MATCHES ".*bcc32c.*" OR CMAKE_CXX_COMPILER MATCHES ".*bcc64x.*")
+ MESSAGE(STATUS "Embarcadero C++Builder detected")
+ SET ( WIN_DEBUG_POSTFIX "" )
+ SET_EMBT_TARGET( LOG4CPP_STATIC RTL )
+ SET_EMBT_TARGET( LOG4CPP_SHARED RTL )
+ ENDIF()
+
+ TARGET_LINK_LIBRARIES ( LOG4CPP_STATIC PRIVATE kernel32 user32 ws2_32 advapi32 msvcrt${WIN_DEBUG_POSTFIX} )
+ #SET_TARGET_PROPERTIES ( LOG4CPP_STATIC PROPERTIES LINK_FLAGS /NODEFAULTLIB:msvcrt${WIN_DEBUG_POSTFIX} )
+ TARGET_LINK_LIBRARIES ( LOG4CPP_SHARED PRIVATE kernel32 user32 ws2_32 advapi32 msvcrt${WIN_DEBUG_POSTFIX} )
+ #SET_TARGET_PROPERTIES ( LOG4CPP_SHARED PROPERTIES LINK_FLAGS /NODEFAULTLIB:msvcrt${WIN_DEBUG_POSTFIX} )
ENDIF (WIN32)
INSTALL (
diff --git a/ChangeLog b/ChangeLog
index 82fbbc1..ea85da3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2025-11-13 20:48 sanchouss_
+ * CMake script update; support for Embarcadero RAD Studio 12
+
2025-11-08 22:37 sanchouss_
* Cmake script update: support release and debug build types (defaults to release); build both static and shared libraries; pass necessary cpp macros for debug
* MS Visual Studio 2022 can open log4cpp as CMake Project
http://sourceforge.net/p/log4cpp/codegit/ci/
commit f77a7b1978c13abc693a3e7e1b376c592abdb259
Author: Alexander Perepelkin <san...@us...>
Date: Thu Nov 13 20:52:06 2025 +0100
Cmake fixes, add RAD Studio 12 support
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0f00163..1075142 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,7 +24,10 @@ ENDIF ()
IF (WIN32)
SET ( CMAKE_DEBUG_POSTFIX "D" )
- ADD_DEFINITIONS ( -D_CRT_SECURE_NO_WARNINGS -DLOG4CPP_HAS_DLL -DLOG4CPP_BUILD_DLL )
+ ADD_DEFINITIONS ( -DWIN32 )
+ IF ( NOT CMAKE_BUILD_TYPE STREQUAL "Release" )
+ SET ( WIN_DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX} )
+ ENDIF()
ELSE (WIN32)
IF (APPLE)
ADD_DEFINITIONS ( -DLOG4CPP_HAVE_SSTREAM )
@@ -97,7 +100,7 @@ ELSE()
ENDIF ()
ENDIF()
-message("LOG4CPP_BUILD_SHARED is ${LOG4CPP_BUILD_SHARED} LOG4CPP_BUILD_STATIC is ${LOG4CPP_BUILD_STATIC}")
+MESSAGE("LOG4CPP_BUILD_SHARED is ${LOG4CPP_BUILD_SHARED}; LOG4CPP_BUILD_STATIC is ${LOG4CPP_BUILD_STATIC}")
IF (LOG4CPP_BUILD_STATIC)
ADD_LIBRARY ( LOG4CPP_STATIC STATIC ${LOG4CPP_LIBRARY_SOURCES} )
@@ -109,20 +112,31 @@ IF (LOG4CPP_BUILD_STATIC)
ENDIF()
TARGET_COMPILE_DEFINITIONS ( LOG4CPP_STATIC PRIVATE $<$<CONFIG:Debug>:_DEBUG DEBUG LOG4CPP_FIX_ERROR_COLLISION> )
TARGET_COMPILE_DEFINITIONS ( LOG4CPP_STATIC PRIVATE $<$<CONFIG:Release>:NDEBUG> )
-ENDIF ()
+ENDIF (LOG4CPP_BUILD_STATIC)
IF (LOG4CPP_BUILD_SHARED)
ADD_LIBRARY ( LOG4CPP_SHARED SHARED ${LOG4CPP_LIBRARY_SOURCES} )
SET_TARGET_PROPERTIES( LOG4CPP_SHARED PROPERTIES OUTPUT_NAME ${LOG4CPP_LIBRARY_NAME} )
TARGET_COMPILE_DEFINITIONS ( LOG4CPP_SHARED PRIVATE $<$<CONFIG:Debug>:_DEBUG DEBUG LOG4CPP_FIX_ERROR_COLLISION> )
TARGET_COMPILE_DEFINITIONS ( LOG4CPP_SHARED PRIVATE $<$<CONFIG:Release>:NDEBUG> )
-ENDIF ()
+ IF (WIN32)
+ TARGET_COMPILE_DEFINITIONS ( LOG4CPP_SHARED PRIVATE -D_CRT_SECURE_NO_WARNINGS -DLOG4CPP_HAS_DLL -DLOG4CPP_BUILD_DLL )
+ ENDIF (WIN32)
+ENDIF (LOG4CPP_BUILD_SHARED)
IF (WIN32)
- TARGET_LINK_LIBRARIES ( LOG4CPP_STATIC PRIVATE kernel32 user32 ws2_32 advapi32 msvcrt${CMAKE_DEBUG_POSTFIX} )
- SET_TARGET_PROPERTIES ( LOG4CPP_STATIC PROPERTIES LINK_FLAGS /NODEFAULTLIB:msvcrt${CMAKE_DEBUG_POSTFIX} )
- TARGET_LINK_LIBRARIES ( LOG4CPP_SHARED PRIVATE kernel32 user32 ws2_32 advapi32 msvcrt${CMAKE_DEBUG_POSTFIX} )
- SET_TARGET_PROPERTIES ( LOG4CPP_SHARED PROPERTIES LINK_FLAGS /NODEFAULTLIB:msvcrt${CMAKE_DEBUG_POSTFIX} )
+ # RAD Studio specifics
+ IF (CMAKE_CXX_COMPILER MATCHES ".*bcc32c.*" OR CMAKE_CXX_COMPILER MATCHES ".*bcc64x.*")
+ MESSAGE(STATUS "Embarcadero C++Builder detected")
+ SET ( WIN_DEBUG_POSTFIX "" )
+ SET_EMBT_TARGET( LOG4CPP_STATIC RTL )
+ SET_EMBT_TARGET( LOG4CPP_SHARED RTL )
+ ENDIF()
+
+ TARGET_LINK_LIBRARIES ( LOG4CPP_STATIC PRIVATE kernel32 user32 ws2_32 advapi32 msvcrt${WIN_DEBUG_POSTFIX} )
+ #SET_TARGET_PROPERTIES ( LOG4CPP_STATIC PROPERTIES LINK_FLAGS /NODEFAULTLIB:msvcrt${WIN_DEBUG_POSTFIX} )
+ TARGET_LINK_LIBRARIES ( LOG4CPP_SHARED PRIVATE kernel32 user32 ws2_32 advapi32 msvcrt${WIN_DEBUG_POSTFIX} )
+ #SET_TARGET_PROPERTIES ( LOG4CPP_SHARED PROPERTIES LINK_FLAGS /NODEFAULTLIB:msvcrt${WIN_DEBUG_POSTFIX} )
ENDIF (WIN32)
INSTALL (
diff --git a/ChangeLog b/ChangeLog
index 82fbbc1..ea85da3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2025-11-13 20:48 sanchouss_
+ * CMake script update; support for Embarcadero RAD Studio 12
+
2025-11-08 22:37 sanchouss_
* Cmake script update: support release and debug build types (defaults to release); build both static and shared libraries; pass necessary cpp macros for debug
* MS Visual Studio 2022 can open log4cpp as CMake Project
http://sourceforge.net/p/log4cpp/codegit/ci/
commit f77a7b1978c13abc693a3e7e1b376c592abdb259
Author: Alexander Perepelkin <san...@us...>
Date: Thu Nov 13 20:52:06 2025 +0100
Cmake fixes, add RAD Studio 12 support
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0f00163..1075142 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,7 +24,10 @@ ENDIF ()
IF (WIN32)
SET ( CMAKE_DEBUG_POSTFIX "D" )
- ADD_DEFINITIONS ( -D_CRT_SECURE_NO_WARNINGS -DLOG4CPP_HAS_DLL -DLOG4CPP_BUILD_DLL )
+ ADD_DEFINITIONS ( -DWIN32 )
+ IF ( NOT CMAKE_BUILD_TYPE STREQUAL "Release" )
+ SET ( WIN_DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX} )
+ ENDIF()
ELSE (WIN32)
IF (APPLE)
ADD_DEFINITIONS ( -DLOG4CPP_HAVE_SSTREAM )
@@ -97,7 +100,7 @@ ELSE()
ENDIF ()
ENDIF()
-message("LOG4CPP_BUILD_SHARED is ${LOG4CPP_BUILD_SHARED} LOG4CPP_BUILD_STATIC is ${LOG4CPP_BUILD_STATIC}")
+MESSAGE("LOG4CPP_BUILD_SHARED is ${LOG4CPP_BUILD_SHARED}; LOG4CPP_BUILD_STATIC is ${LOG4CPP_BUILD_STATIC}")
IF (LOG4CPP_BUILD_STATIC)
ADD_LIBRARY ( LOG4CPP_STATIC STATIC ${LOG4CPP_LIBRARY_SOURCES} )
@@ -109,20 +112,31 @@ IF (LOG4CPP_BUILD_STATIC)
ENDIF()
TARGET_COMPILE_DEFINITIONS ( LOG4CPP_STATIC PRIVATE $<$<CONFIG:Debug>:_DEBUG DEBUG LOG4CPP_FIX_ERROR_COLLISION> )
TARGET_COMPILE_DEFINITIONS ( LOG4CPP_STATIC PRIVATE $<$<CONFIG:Release>:NDEBUG> )
-ENDIF ()
+ENDIF (LOG4CPP_BUILD_STATIC)
IF (LOG4CPP_BUILD_SHARED)
ADD_LIBRARY ( LOG4CPP_SHARED SHARED ${LOG4CPP_LIBRARY_SOURCES} )
SET_TARGET_PROPERTIES( LOG4CPP_SHARED PROPERTIES OUTPUT_NAME ${LOG4CPP_LIBRARY_NAME} )
TARGET_COMPILE_DEFINITIONS ( LOG4CPP_SHARED PRIVATE $<$<CONFIG:Debug>:_DEBUG DEBUG LOG4CPP_FIX_ERROR_COLLISION> )
TARGET_COMPILE_DEFINITIONS ( LOG4CPP_SHARED PRIVATE $<$<CONFIG:Release>:NDEBUG> )
-ENDIF ()
+ IF (WIN32)
+ TARGET_COMPILE_DEFINITIONS ( LOG4CPP_SHARED PRIVATE -D_CRT_SECURE_NO_WARNINGS -DLOG4CPP_HAS_DLL -DLOG4CPP_BUILD_DLL )
+ ENDIF (WIN32)
+ENDIF (LOG4CPP_BUILD_SHARED)
IF (WIN32)
- TARGET_LINK_LIBRARIES ( LOG4CPP_STATIC PRIVATE kernel32 user32 ws2_32 advapi32 msvcrt${CMAKE_DEBUG_POSTFIX} )
- SET_TARGET_PROPERTIES ( LOG4CPP_STATIC PROPERTIES LINK_FLAGS /NODEFAULTLIB:msvcrt${CMAKE_DEBUG_POSTFIX} )
- TARGET_LINK_LIBRARIES ( LOG4CPP_SHARED PRIVATE kernel32 user32 ws2_32 advapi32 msvcrt${CMAKE_DEBUG_POSTFIX} )
- SET_TARGET_PROPERTIES ( LOG4CPP_SHARED PROPERTIES LINK_FLAGS /NODEFAULTLIB:msvcrt${CMAKE_DEBUG_POSTFIX} )
+ # RAD Studio specifics
+ IF (CMAKE_CXX_COMPILER MATCHES ".*bcc32c.*" OR CMAKE_CXX_COMPILER MATCHES ".*bcc64x.*")
+ MESSAGE(STATUS "Embarcadero C++Builder detected")
+ SET ( WIN_DEBUG_POSTFIX "" )
+ SET_EMBT_TARGET( LOG4CPP_STATIC RTL )
+ SET_EMBT_TARGET( LOG4CPP_SHARED RTL )
+ ENDIF()
+
+ TARGET_LINK_LIBRARIES ( LOG4CPP_STATIC PRIVATE kernel32 user32 ws2_32 advapi32 msvcrt${WIN_DEBUG_POSTFIX} )
+ #SET_TARGET_PROPERTIES ( LOG4CPP_STATIC PROPERTIES LINK_FLAGS /NODEFAULTLIB:msvcrt${WIN_DEBUG_POSTFIX} )
+ TARGET_LINK_LIBRARIES ( LOG4CPP_SHARED PRIVATE kernel32 user32 ws2_32 advapi32 msvcrt${WIN_DEBUG_POSTFIX} )
+ #SET_TARGET_PROPERTIES ( LOG4CPP_SHARED PROPERTIES LINK_FLAGS /NODEFAULTLIB:msvcrt${WIN_DEBUG_POSTFIX} )
ENDIF (WIN32)
INSTALL (
diff --git a/ChangeLog b/ChangeLog
index 82fbbc1..ea85da3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2025-11-13 20:48 sanchouss_
+ * CMake script update; support for Embarcadero RAD Studio 12
+
2025-11-08 22:37 sanchouss_
* Cmake script update: support release and debug build types (defaults to release); build both static and shared libraries; pass necessary cpp macros for debug
* MS Visual Studio 2022 can open log4cpp as CMake Project
-----------------------------------------------------------------------
Summary of changes:
AUTHORS | 19 ++++++++++++++++++-
CMakeLists.txt | 30 ++++++++++++++++++++++--------
ChangeLog | 3 +++
doc/html/index.html | 31 ++++++++++++++++++++++++-------
src/DailyRollingFileAppender.cpp | 2 ++
5 files changed, 69 insertions(+), 16 deletions(-)
hooks/post-receive
--
Log4cpp Git repository.
|
