diff options
| author | Nobuaki Sukegawa <nsuke@apache.org> | 2015-11-14 00:23:40 +0900 |
|---|---|---|
| committer | Nobuaki Sukegawa <nsuke@apache.org> | 2015-11-23 16:59:10 +0900 |
| commit | ca93936e781508e9f9c8e58c26a08809b037cc29 (patch) | |
| tree | f032a0ea3ccee31eda1f1ab034dc531978098307 /lib/cpp/CMakeLists.txt | |
| parent | 314fea26fe4d85d17d785d97f1e814fb448b82b9 (diff) | |
| download | thrift-ca93936e781508e9f9c8e58c26a08809b037cc29.tar.gz | |
THRIFT-3424 Add CMake android build option
Client: Build
Patch: Nobuaki Sukegawa
This closes #696
Diffstat (limited to 'lib/cpp/CMakeLists.txt')
| -rwxr-xr-x | lib/cpp/CMakeLists.txt | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/lib/cpp/CMakeLists.txt b/lib/cpp/CMakeLists.txt index a0b97437c..9404112cc 100755 --- a/lib/cpp/CMakeLists.txt +++ b/lib/cpp/CMakeLists.txt @@ -46,7 +46,6 @@ set( thriftcpp_SOURCES src/thrift/protocol/TJSONProtocol.cpp src/thrift/protocol/TMultiplexedProtocol.cpp src/thrift/protocol/TProtocol.cpp - src/thrift/protocol/THeaderProtocol.cpp src/thrift/transport/TTransportException.cpp src/thrift/transport/TFDTransport.cpp src/thrift/transport/TSimpleFileTransport.cpp @@ -58,7 +57,6 @@ set( thriftcpp_SOURCES src/thrift/transport/TServerSocket.cpp src/thrift/transport/TTransportUtils.cpp src/thrift/transport/TBufferTransports.cpp - src/thrift/transport/THeaderTransport.cpp src/thrift/server/TConnectedClient.cpp src/thrift/server/TServerFramework.cpp src/thrift/server/TSimpleServer.cpp @@ -119,7 +117,11 @@ if(WITH_BOOSTTHREADS) ) list(APPEND SYSLIBS "${Boost_LIBRARIES}") elseif(UNIX AND NOT WITH_STDTHREADS) - list(APPEND SYSLIBS pthread) + if(ANDROID) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread") + else() + list(APPEND SYSLIBS pthread) + endif() set( thriftcpp_threads_SOURCES src/thrift/concurrency/PosixThreadFactory.cpp src/thrift/concurrency/Mutex.cpp @@ -127,8 +129,11 @@ elseif(UNIX AND NOT WITH_STDTHREADS) ) else() if(UNIX) - # need pthread for multi-thread support - list(APPEND SYSLIBS pthread) + if(ANDROID) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread") + else() + list(APPEND SYSLIBS pthread) + endif() endif() set( thriftcpp_threads_SOURCES src/thrift/concurrency/StdThreadFactory.cpp @@ -150,6 +155,8 @@ set( thriftcppz_SOURCES src/thrift/transport/TZlibTransport.cpp src/thrift/protocol/THeaderProtocol.cpp src/thrift/transport/THeaderTransport.cpp + src/thrift/protocol/THeaderProtocol.cpp + src/thrift/transport/THeaderTransport.cpp ) # Thrift Qt4 server |