commit 1673adf94a381d66db2f0a062c636b24937473f7
author Jim King <jim.king@simplivity.com> Mon Apr 13 12:25:35 2015 -0400
committer Roger Meier <roger@apache.org> Mon Apr 13 21:05:53 2015 +0200
tree 6f08b4fbcad8bc39e151aec48a7a17d8e81e05b5
parent 932c3ee66e8bddf3619e063683a6047e7673b76c

THRIFT-3094 fix broken cmake build of C++ library with alternate threading

build/cmake/DefinePlatformSpecifc.cmake

diff --git a/build/cmake/DefinePlatformSpecifc.cmake b/build/cmake/DefinePlatformSpecifc.cmake
index 282cad3..bafbf49 100644
--- a/build/cmake/DefinePlatformSpecifc.cmake
+++ b/build/cmake/DefinePlatformSpecifc.cmake
@@ -56,7 +56,17 @@
     else(WITH_MT)
         set(STATIC_POSTFIX "md" CACHE STRING "Set static library postfix" FORCE)
     endif(WITH_MT)
-endif(MSVC)
+
+elseif(UNIX)
+  # For UNIX
+  # WITH_*THREADS selects which threading library to use
+  if(WITH_BOOSTTHREADS)
+    add_definitions("-DUSE_BOOST_THREAD=1")
+  elseif(WITH_STDTHREADS)
+    add_definitions("-DUSE_STD_THREAD=1")
+  endif()
+
+endif()
 
 # GCC Specific
 if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)

lib/cpp/CMakeLists.txt

diff --git a/lib/cpp/CMakeLists.txt b/lib/cpp/CMakeLists.txt
index 4c73986..9075c56 100755
--- a/lib/cpp/CMakeLists.txt
+++ b/lib/cpp/CMakeLists.txt
@@ -104,7 +104,6 @@
 
 # WITH_*THREADS selects which threading library to use
 if(WITH_BOOSTTHREADS)
-    add_definitions("-DUSE_BOOST_THREAD=1")
     set( thriftcpp_threads_SOURCES
         src/thrift/concurrency/BoostThreadFactory.cpp
         src/thrift/concurrency/BoostMonitor.cpp
@@ -119,7 +118,6 @@
         src/thrift/concurrency/Monitor.cpp
     )
 else()
-    add_definitions("-DUSE_STD_THREAD=1")
     if(UNIX)
         # need pthread for multi-thread support
         list(APPEND SYSLIBS pthread)