You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rm...@apache.org on 2020/09/04 01:36:47 UTC
[logging-log4cxx] branch logcxx_510_rm_vs2019 updated (5ba150c ->
3ac7bff)
This is an automated email from the ASF dual-hosted git repository.
rmiddleton pushed a change to branch logcxx_510_rm_vs2019
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git.
from 5ba150c Set the PATH for the tests appropriately
new 3e53c55 Handle XMLLIB_DLL the same like the corresponding ones for APR and APU. This makes XMLLIB_DLL configurable in VS.
new 3ac7bff Use find expat
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CMakeLists.txt | 4 ++++
src/cmake/FindAPR-Util.cmake | 3 +--
src/test/cpp/CMakeLists.txt | 5 ++++-
3 files changed, 9 insertions(+), 3 deletions(-)
[logging-log4cxx] 01/02: Handle XMLLIB_DLL the same like the
corresponding ones for APR and APU. This makes XMLLIB_DLL configurable in
VS.
Posted by rm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rmiddleton pushed a commit to branch logcxx_510_rm_vs2019
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git
commit 3e53c55fa263317dc50815358787cf21210b4011
Author: Thorsten Schöning <ts...@am-soft.de>
AuthorDate: Wed Sep 2 08:52:43 2020 +0200
Handle XMLLIB_DLL the same like the corresponding ones for APR and APU. This makes XMLLIB_DLL configurable in VS.
---
src/cmake/FindAPR-Util.cmake | 5 +++--
src/test/cpp/CMakeLists.txt | 5 ++++-
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/cmake/FindAPR-Util.cmake b/src/cmake/FindAPR-Util.cmake
index bb4e951..76d4c3b 100644
--- a/src/cmake/FindAPR-Util.cmake
+++ b/src/cmake/FindAPR-Util.cmake
@@ -48,11 +48,12 @@ else()
if (APU_STATIC OR NOT BUILD_SHARED_LIBS)
set(APR_UTIL_COMPILE_DEFINITIONS APU_DECLARE_STATIC)
find_library(APR_UTIL_LIBRARIES NAMES aprutil-1)
- find_library(XMLLIB_LIBRARIES NAMES libexpat)
- find_program(XMLLIB_DLL libexpat.dll)
+ find_library(XMLLIB_LIBRARIES NAMES expat)
else()
find_library(APR_UTIL_LIBRARIES NAMES libaprutil-1)
find_program(APR_UTIL_DLL libaprutil-1.dll)
+ find_library(XMLLIB_LIBRARIES NAMES libexpatd)
+ find_program(XMLLIB_DLL libexpatd.dll)
endif()
endif()
diff --git a/src/test/cpp/CMakeLists.txt b/src/test/cpp/CMakeLists.txt
index d1e44bb..d81b213 100644
--- a/src/test/cpp/CMakeLists.txt
+++ b/src/test/cpp/CMakeLists.txt
@@ -61,7 +61,10 @@ add_subdirectory(xml)
if( WIN32 )
get_filename_component(APR_DLL_DIR "${APR_DLL}" DIRECTORY)
get_filename_component(APR_UTIL_DLL_DIR "${APR_UTIL_DLL}" DIRECTORY)
- set(PATH_FOR_TESTS $<SHELL_PATH:$<TARGET_FILE_DIR:log4cxx>>;${APR_DLL_DIR};${APR_UTIL_DLL_DIR}\;)
+ get_filename_component(XMLLIB_DLL_DIR "${XMLLIB_DLL}" DIRECTORY)
+
+ set(LOG4CXX_DLL_DIR "$<SHELL_PATH:$<TARGET_FILE_DIR:log4cxx>>;")
+ set(PATH_FOR_TESTS ${APR_DLL_DIR};${APR_UTIL_DLL_DIR};${LOG4CXX_DLL_DIR};${XMLLIB_DLL_DIR}\;)
list(REMOVE_DUPLICATES PATH_FOR_TESTS)
set(NORMAL_PATH $ENV{PATH})
set(ESCAPED_PATH "")
[logging-log4cxx] 02/02: Use find expat
Posted by rm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rmiddleton pushed a commit to branch logcxx_510_rm_vs2019
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git
commit 3ac7bff2d320334660d5be7bc1513025f231fedb
Author: Robert Middleton <ro...@rm5248.com>
AuthorDate: Thu Sep 3 21:18:31 2020 -0400
Use find expat
---
CMakeLists.txt | 4 ++++
src/cmake/FindAPR-Util.cmake | 2 --
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d30a71b..f380439 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,6 +23,10 @@ find_package(APR REQUIRED)
# Find Apache Runtime Utilities
find_package(APR-Util REQUIRED)
+# Find expat for XML parsing
+find_package(EXPAT REQUIRED)
+set(XMLLIB_LIBRARIES EXPAT_LIBRARIES)
+
# Building
add_subdirectory(src)
diff --git a/src/cmake/FindAPR-Util.cmake b/src/cmake/FindAPR-Util.cmake
index 76d4c3b..aecb240 100644
--- a/src/cmake/FindAPR-Util.cmake
+++ b/src/cmake/FindAPR-Util.cmake
@@ -52,8 +52,6 @@ else()
else()
find_library(APR_UTIL_LIBRARIES NAMES libaprutil-1)
find_program(APR_UTIL_DLL libaprutil-1.dll)
- find_library(XMLLIB_LIBRARIES NAMES libexpatd)
- find_program(XMLLIB_DLL libexpatd.dll)
endif()
endif()