Commit d6d5c792 authored by Harris Hancock's avatar Harris Hancock

Allow MSVC to build non-lite mode

parent c7268191
...@@ -34,11 +34,6 @@ if(CAPNP_LITE AND BUILD_TESTING AND NOT EXTERNAL_CAPNP) ...@@ -34,11 +34,6 @@ if(CAPNP_LITE AND BUILD_TESTING AND NOT EXTERNAL_CAPNP)
message(SEND_ERROR "You must set EXTERNAL_CAPNP when using CAPNP_LITE and BUILD_TESTING.") message(SEND_ERROR "You must set EXTERNAL_CAPNP when using CAPNP_LITE and BUILD_TESTING.")
endif() endif()
if(MSVC AND NOT CAPNP_LITE)
message(SEND_ERROR "Building with MSVC is only supported with CAPNP_LITE.")
endif()
if(CAPNP_LITE) if(CAPNP_LITE)
set(CAPNP_LITE_FLAG "-DCAPNP_LITE") set(CAPNP_LITE_FLAG "-DCAPNP_LITE")
# This flag is attached as PUBLIC target_compile_definition to kj target # This flag is attached as PUBLIC target_compile_definition to kj target
......
...@@ -44,11 +44,6 @@ namespace capnp { ...@@ -44,11 +44,6 @@ namespace capnp {
#define CAPNP_VERSION \ #define CAPNP_VERSION \
(CAPNP_VERSION_MAJOR * 1000000 + CAPNP_VERSION_MINOR * 1000 + CAPNP_VERSION_MICRO) (CAPNP_VERSION_MAJOR * 1000000 + CAPNP_VERSION_MINOR * 1000 + CAPNP_VERSION_MICRO)
#ifdef _MSC_VER
#define CAPNP_LITE 1
// MSVC only supports "lite" mode for now, due to missing C++11 features.
#endif
#ifndef CAPNP_LITE #ifndef CAPNP_LITE
#define CAPNP_LITE 0 #define CAPNP_LITE 0
#endif #endif
......
...@@ -63,9 +63,6 @@ ...@@ -63,9 +63,6 @@
#elif defined(_MSC_VER) #elif defined(_MSC_VER)
#if _MSC_VER < 1900 #if _MSC_VER < 1900
#error "You need Visual Studio 2015 or better to compile this code." #error "You need Visual Studio 2015 or better to compile this code."
#elif !CAPNP_LITE
// TODO(cleanup): This is KJ, but we're talking about Cap'n Proto.
#error "As of this writing, Cap'n Proto only supports Visual C++ in 'lite mode'; please #define CAPNP_LITE"
#endif #endif
#else #else
#warning "I don't recognize your compiler. As of this writing, Clang and GCC are the only "\ #warning "I don't recognize your compiler. As of this writing, Clang and GCC are the only "\
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment