Some fixes, run logging-test

wesm · wesm · commit e3203a598353 · 2018-09-17T12:39:18.000-04:00
Change-Id: I7891cde0c10c6a642c500e46f0ddff448fe3c467
diff --git a/cpp/src/arrow/python/CMakeLists.txt b/cpp/src/arrow/python/CMakeLists.txt
@@ -61,7 +61,7 @@ if (WIN32)
     )
 endif()
 
-if (PTHREAD_LIBRARY)
+if (NOT WIN32 AND ARROW_USE_GLOG AND PTHREAD_LIBRARY)
   set(ARROW_PYTHON_SHARED_LINK_LIBS
     ${ARROW_PYTHON_SHARED_LINK_LIBS}
     ${PTHREAD_LIBRARY})
diff --git a/cpp/src/arrow/util/CMakeLists.txt b/cpp/src/arrow/util/CMakeLists.txt
@@ -62,7 +62,7 @@ ADD_ARROW_TEST(parsing-util-test)
 ADD_ARROW_TEST(stl-util-test)
 ADD_ARROW_TEST(thread-pool-test)
 ADD_ARROW_TEST(lazy-test)
-#ADD_ARROW_TEST(logging-test)
+ADD_ARROW_TEST(logging-test)
 
 ADD_ARROW_BENCHMARK(bit-util-benchmark)
 ADD_ARROW_BENCHMARK(decimal-benchmark)
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
@@ -489,7 +489,7 @@ if (PYARROW_BUILD_ORC)
 endif()
 
 find_library(PTHREAD_LIBRARY pthread)
-if (PTHREAD_LIBRARY)
+if (ARROW_USE_GLOG AND PTHREAD_LIBRARY)
   set(LINK_LIBS ${LINK_LIBS} ${PTHREAD_LIBRARY})
 endif()
 

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ if (WIN32)`
`61`	`61`	`)`
`62`	`62`	`endif()`
`63`	`63`
`64`		`-if (PTHREAD_LIBRARY)`
	`64`	`+if (NOT WIN32 AND ARROW_USE_GLOG AND PTHREAD_LIBRARY)`
`65`	`65`	`set(ARROW_PYTHON_SHARED_LINK_LIBS`
`66`	`66`	`${ARROW_PYTHON_SHARED_LINK_LIBS}`
`67`	`67`	`${PTHREAD_LIBRARY})`