libtransport.git Changeset - 09ebd5487d7f

Changeset - 09ebd5487d7f

Parent rev.

Child rev.

[Not reviewed]

0 2 0

Florian Kinder - 7 years ago 2018-12-01 11:39:11
florian.kinder@fankserver.com

build fixes

2 files changed with 2 insertions and 2 deletions:

CMakeLists.txt

Dockerfile-alpine

0 comments (0 inline, 0 general)

CMakeLists.txt

➞

Show inline comments

@@ @@ -11,13 +11,13 @@ message(STATUS " |- zlib : -DZLIB_LIBRARY") @@
 message(STATUS "  |- expat :                         -DEXPAT_LIBRARY")
 message(STATUS "  |-libidn :                         -DLIBIDN_LIBRARY")
 message(STATUS "  |-libxml :                         -DLIBXML_LIBRARY")
 message(STATUS "|- boost   : -DBOOST_INCLUDEDIR,     -DBOOST_LIBRARYDIR")
 message(STATUS "|- protobuf: -DPROTOBUF_INCLUDE_DIR, -DPROTOBUF_LIBRARY")
 message(STATUS "           : -DPROTOBUF_PROTOC_EXECUTABLE")
-message(STATUS "|- log4cxx : -DLOG4CXX_INCLUDE_DIR,  -DLOG4CXX_LIBRARY")
+message(STATUS "|- log4cxx : -DLOG4CXX_INCLUDE_DIR,  -DLOG4CXX_LIBRARIES")
 message(STATUS "|- purple  : -DPURPLE_INCLUDE_DIR,   -DPURPLE_LIBRARY")
 message(STATUS "           : -DPURPLE_NOT_RUNTIME - enables compilation with libpurple.lib")
 message(STATUS "|- pgxx    : -DPQXX_INCLUDE_DIR,     -DPQXX_LIBRARY")
 message(STATUS "|- irc     : -DIRC_INCLUDE_DIR,      -DIRC_LIBRARY")
 option(ENABLE_SQLITE3 "Build with SQLite3 support" ON)

Dockerfile-alpine

➞

Show inline comments

@@ @@ -42,13 +42,13 @@ RUN apk add --no-cache ca-certificates && \ @@
 	cd swift-* && \
 	./scons Swiften SWIFTEN_INSTALLDIR=/opt/_swiften /opt/_swiften && \
 	cd .. && \
 	rm -rf swift-* && \
 	cd spectrum2 && \
-	cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr -DLOG4CXX_INCLUDE_DIR=/opt/log4cxx/include -DLOG4CXX_LIBRARY=/opt/log4cxx/lib -DSWIFTEN_INCLUDE_DIR=/opt/_swiften/include -DSWIFTEN_LIBRARY=/opt/_swiften/lib -DSWIFTEN_CONFIG_EXECUTABLE=/opt/_swiften/bin/swiften-config -DPQXX_INCLUDE_DIR=/opt/libpqxx/include -DPQXX_LIBRARY=/opt/libpqxx/lib -DPQ_LIBRARY=/opt/libpqxx/lib -DIRC_INCLUDE_DIR=/opt/libcommuni/include -DIRC_LIBRARY=/opt/libcommuni/lib -DIRC_MODEL_LIBRARY=/opt/libcommuni/lib && \
+	cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr -DLOG4CXX_INCLUDE_DIR=/opt/log4cxx/include -DLOG4CXX_LIBRARIES=/opt/log4cxx/lib/liblog4cxx.so -DSWIFTEN_INCLUDE_DIR=/opt/_swiften/include -DSWIFTEN_LIBRARY=/opt/_swiften/lib -DSWIFTEN_CONFIG_EXECUTABLE=/opt/_swiften/bin/swiften-config -DPQXX_INCLUDE_DIR=/opt/libpqxx/include -DPQXX_LIBRARY=/opt/libpqxx/lib/libpqxx.so -DPQ_LIBRARY=/opt/libpqxx/lib/libpqxx.so -DIRC_INCLUDE_DIR=/opt/libcommuni/include -DIRC_LIBRARY=/opt/libcommuni/lib/libIrcCore.so && \
 	make && \
 	make install && \
 	cd .. && \
 	rm /opt/* -rf && \

0 comments (0 inline, 0 general)