Title: [188246] trunk/Source/ThirdParty
- Revision
- 188246
- Author
- [email protected]
- Date
- 2015-08-10 21:25:22 -0700 (Mon, 10 Aug 2015)
Log Message
[Win] Unreviewed build fix after r188239.
* gtest/CMakeLists.txt:
VS2015 requires __STDC_LIMIT_MACROS to be defined for INTMAX_MAX to be defined.
Modified Paths
Diff
Modified: trunk/Source/ThirdParty/ChangeLog (188245 => 188246)
--- trunk/Source/ThirdParty/ChangeLog 2015-08-11 03:46:43 UTC (rev 188245)
+++ trunk/Source/ThirdParty/ChangeLog 2015-08-11 04:25:22 UTC (rev 188246)
@@ -1,5 +1,12 @@
2015-08-10 Alex Christensen <[email protected]>
+ [Win] Unreviewed build fix after r188239.
+
+ * gtest/CMakeLists.txt:
+ VS2015 requires __STDC_LIMIT_MACROS to be defined for INTMAX_MAX to be defined.
+
+2015-08-10 Alex Christensen <[email protected]>
+
Build TestWebKitAPI with CMake on Windows
https://bugs.webkit.org/show_bug.cgi?id=147851
Modified: trunk/Source/ThirdParty/gtest/CMakeLists.txt (188245 => 188246)
--- trunk/Source/ThirdParty/gtest/CMakeLists.txt 2015-08-11 03:46:43 UTC (rev 188245)
+++ trunk/Source/ThirdParty/gtest/CMakeLists.txt 2015-08-11 04:25:22 UTC (rev 188246)
@@ -24,6 +24,11 @@
${GTEST_DIR}/src/gtest-typed-test.cc
)
+if (WIN32)
+ # MSVC 2015 requires this definition for INTMAX_MAX to be defined.
+ add_definitions(-D__STDC_LIMIT_MACROS)
+endif ()
+
add_library(gtest SHARED ${GTEST_SOURCES})
include_directories(${GTEST_INCLUDE_DIRECTORIES})
add_definitions(-DGTEST_CREATE_SHARED_LIBRARY=1 -DGTEST_HAS_RTTI=0)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
