Title: [211044] trunk/Source/ThirdParty
- Revision
- 211044
- Author
- [email protected]
- Date
- 2017-01-23 10:45:51 -0800 (Mon, 23 Jan 2017)
Log Message
gtest fails to link on Linux due to missing -lpthread
https://bugs.webkit.org/show_bug.cgi?id=167313
Reviewed by Alex Christensen.
* gtest/CMakeLists.txt: Add call to find_package(Threads) before testing CMAKE_USE_PTHREADS_INIT.
Without the find_package call, CMAKE_USE_PTHREADS_INIT was always false for me. Also explicitly
define GTEST_HAS_PTHREAD to 0 when CMAKE_USE_PTHREADS_INIT is false to prevent gtest-port.h from
setting GTEST_HAS_PTHREAD based on the platform.
Modified Paths
Property Changed
Diff
Modified: trunk/Source/ThirdParty/ChangeLog (211043 => 211044)
--- trunk/Source/ThirdParty/ChangeLog 2017-01-23 18:45:17 UTC (rev 211043)
+++ trunk/Source/ThirdParty/ChangeLog 2017-01-23 18:45:51 UTC (rev 211044)
@@ -1,3 +1,15 @@
+2017-01-23 Timothy Hatcher <[email protected]>
+
+ gtest fails to link on Linux due to missing -lpthread
+ https://bugs.webkit.org/show_bug.cgi?id=167313
+
+ Reviewed by Alex Christensen.
+
+ * gtest/CMakeLists.txt: Add call to find_package(Threads) before testing CMAKE_USE_PTHREADS_INIT.
+ Without the find_package call, CMAKE_USE_PTHREADS_INIT was always false for me. Also explicitly
+ define GTEST_HAS_PTHREAD to 0 when CMAKE_USE_PTHREADS_INIT is false to prevent gtest-port.h from
+ setting GTEST_HAS_PTHREAD based on the platform.
+
2017-01-20 Youenn Fablet <[email protected]>
[WebRTC] Add libwebrtc build infrastructure
Modified: trunk/Source/ThirdParty/gtest/CMakeLists.txt (211043 => 211044)
--- trunk/Source/ThirdParty/gtest/CMakeLists.txt 2017-01-23 18:45:17 UTC (rev 211043)
+++ trunk/Source/ThirdParty/gtest/CMakeLists.txt 2017-01-23 18:45:51 UTC (rev 211044)
@@ -45,7 +45,11 @@
WTF
)
+find_package(Threads)
+
if (CMAKE_USE_PTHREADS_INIT)
target_link_libraries(gtest ${CMAKE_THREAD_LIBS_INIT})
add_definitions(-DGTEST_HAS_PTHREAD=1)
+else ()
+ add_definitions(-DGTEST_HAS_PTHREAD=0)
endif ()
Property changes on: trunk/Source/ThirdParty/gtest/CMakeLists.txt
___________________________________________________________________
Added: svn:executable
+*
\ No newline at end of property
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
