You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by ro...@apache.org on 2015/04/20 22:27:49 UTC
thrift git commit: THRIFT-3090 cmake build is broken on MacOSX.
Repository: thrift
Updated Branches:
refs/heads/master 018c1b8f7 -> 98201b060
THRIFT-3090 cmake build is broken on MacOSX.
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/98201b06
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/98201b06
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/98201b06
Branch: refs/heads/master
Commit: 98201b06053e6c5d74ba3ec5ec702f1892a8dec2
Parents: 018c1b8
Author: Marco Molteni <ma...@laposte.net>
Authored: Fri Apr 17 10:18:35 2015 +0200
Committer: Roger Meier <ro...@apache.org>
Committed: Mon Apr 20 22:26:37 2015 +0200
----------------------------------------------------------------------
lib/cpp/CMakeLists.txt | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/98201b06/lib/cpp/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/lib/cpp/CMakeLists.txt b/lib/cpp/CMakeLists.txt
index 82cd042..a965593 100755
--- a/lib/cpp/CMakeLists.txt
+++ b/lib/cpp/CMakeLists.txt
@@ -156,7 +156,7 @@ if(WITH_LIBEVENT)
include_directories(SYSTEM ${LIBEVENT_INCLUDE_DIRS})
ADD_LIBRARY_THRIFT(thriftnb ${thriftcppnb_SOURCES})
- TARGET_LINK_LIBRARIES_THRIFT(thriftnb ${SYSLIBS} ${LIBEVENT_LIBRARIES})
+ TARGET_LINK_LIBRARIES_THRIFT(thriftnb thrift ${SYSLIBS} ${LIBEVENT_LIBRARIES})
endif()
if(WITH_ZLIB)
@@ -164,14 +164,14 @@ if(WITH_ZLIB)
include_directories(SYSTEM ${ZLIB_INCLUDE_DIRS})
ADD_LIBRARY_THRIFT(thriftz ${thriftcppz_SOURCES})
- TARGET_LINK_LIBRARIES_THRIFT(thriftz ${SYSLIBS} ${ZLIB_LIBRARIES})
+ TARGET_LINK_LIBRARIES_THRIFT(thriftz thrift ${SYSLIBS} ${ZLIB_LIBRARIES})
endif()
if(WITH_QT4)
set(CMAKE_AUTOMOC ON)
find_package(Qt4 REQUIRED COMPONENTS QtCore QtNetwork)
ADD_LIBRARY_THRIFT(thriftqt ${thriftcppqt_SOURCES})
- TARGET_LINK_LIBRARIES_THRIFT(thriftqt ${SYSLIBS} Qt4::QtCore Qt4::QtNetwork)
+ TARGET_LINK_LIBRARIES_THRIFT(thriftqt thrift ${SYSLIBS} Qt4::QtCore Qt4::QtNetwork)
endif()
if(WITH_QT5)