X-Git-Url: http://plrg.eecs.uci.edu/git/?p=folly.git;a=blobdiff_plain;f=CMakeLists.txt;h=c17760a2ed731b3d2c9e21cc81206a24c3d6f9d8;hp=367014648760a9f887e069620cd18f8563cdce69;hb=b3e7df8220f410398011fea71b280ba8be459fcc;hpb=b8d8ea5abc428bc1991357e40a086b3cb34e68d9
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 36701464..c17760a2 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,8 +7,10 @@ cmake_minimum_required(VERSION 3.4.0 FATAL_ERROR)
# the alternatives are far, far worse.
if ("${CMAKE_GENERATOR}" MATCHES "Visual Studio 15( 2017)? Win64")
set(CMAKE_GENERATOR_TOOLSET "v141truev141")
+ set(MSVC_IS_2017 ON)
elseif ("${CMAKE_GENERATOR}" STREQUAL "Visual Studio 14 2015 Win64")
set(CMAKE_GENERATOR_TOOLSET "v140truev140")
+ set(MSVC_IS_2017 OFF)
else()
message(FATAL_ERROR "This build script only supports building Folly on 64-bit Windows with Visual Studio 2015 or Visual Studio 2017.")
endif()
@@ -261,6 +263,10 @@ if (BUILD_TESTS)
${FOLLY_DIR}/io/async/test/UndelayedDestruction.h
${FOLLY_DIR}/io/async/test/Util.h
)
+ target_compile_definitions(folly_test_support
+ PUBLIC
+ ${LIBGMOCK_DEFINES}
+ )
target_include_directories(folly_test_support
PUBLIC
${LIBGMOCK_INCLUDE_DIR}