summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDaniel Stonier <d.stonier@gmail.com>2012-05-02 13:32:45 (GMT)
committerDaniel Stonier <d.stonier@gmail.com>2012-05-02 13:32:45 (GMT)
commit03e3e411ac2a25378201a10b20688e6589519ef7 (patch)
tree15378e68420710c4e8670535c0029ec1740daf65 /src
parentc89070d401db64cc48117b09a3a6fde496d2295a (diff)
downloadmxe-03e3e411ac2a25378201a10b20688e6589519ef7.zip
mxe-03e3e411ac2a25378201a10b20688e6589519ef7.tar.gz
mxe-03e3e411ac2a25378201a10b20688e6589519ef7.tar.bz2
adding a cmake config module patch for log4cxx.
Diffstat (limited to 'src')
-rw-r--r--src/log4cxx-5-cmake.patch14
-rw-r--r--src/log4cxx.mk2
2 files changed, 16 insertions, 0 deletions
diff --git a/src/log4cxx-5-cmake.patch b/src/log4cxx-5-cmake.patch
new file mode 100644
index 0000000..f1ce0f6
--- /dev/null
+++ b/src/log4cxx-5-cmake.patch
@@ -0,0 +1,14 @@
+diff -NBaur vanilla/log4cxx-config.cmake mingw_cross/log4cxx-config.cmake
+--- vanilla/log4cxx-config.cmake 1970-01-01 09:00:00.000000000 +0900
++++ mingw_cross/log4cxx-config.cmake 2012-03-14 15:29:54.706247316 +0900
+@@ -0,0 +1,10 @@
++
++set(LOG4CXX_VERSION 0.10.0)
++
++get_filename_component(LOG4CXX_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
++
++set(LOG4CXX_INCLUDE_DIR "${LOG4CXX_CMAKE_DIR}/../../../include" CACHE FILEPATH "Log4cxx include directory")
++set(LOG4CXX_INCLUDE_DIRS "${LOG4CXX_INCLUDE_DIR}")
++set(LOG4CXX_LIBRARY_DIRS "${LOG4CXX_CMAKE_DIR}/../../../lib")
++set(LOG4CXX_LIBRARIES "log4cxx;aprutil-1;iconv;expat;apr-1;rpcrt4;shell32;ws2_32;advapi32;kernel32;msvcrt")
++
diff --git a/src/log4cxx.mk b/src/log4cxx.mk
index d1a10ab..656c03d 100644
--- a/src/log4cxx.mk
+++ b/src/log4cxx.mk
@@ -27,6 +27,8 @@ define $(PKG)_BUILD
CFLAGS=-D_WIN32_WINNT=0x0500 \
CXXFLAGS=-D_WIN32_WINNT=0x0500
$(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man_MANS=
+ mkdir -p $(PREFIX)/$(TARGET)/share/cmake/log4cxx
+ cp $(1)/log4cxx-config.cmake $(PREFIX)/$(TARGET)/share/cmake/log4cxx/log4cxx-config.cmake
'$(TARGET)-g++' \
-W -Wall -Werror -ansi -pedantic \