diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2fd957d9..1f42f886 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -69,7 +69,9 @@ if(CMAKE_CXX_COMPILER MATCHES "clang")
 	ADD_DEFINITIONS(-std=c++0x) #Enable C++0x mode
 endif()
 
-INCLUDE(cmake/Modules/CheckCXX11Features.cmake)
+if(NOT MSVC) #This is causing problems in Visual Studio so disable it for now
+	INCLUDE(cmake/Modules/CheckCXX11Features.cmake)
+endif()
 
 ADD_SUBDIRECTORY(library)
 
diff --git a/library/PolyVoxCore/CMakeLists.txt b/library/PolyVoxCore/CMakeLists.txt
index f6f9753f..69c66052 100644
--- a/library/PolyVoxCore/CMakeLists.txt
+++ b/library/PolyVoxCore/CMakeLists.txt
@@ -22,8 +22,10 @@
 
 PROJECT(PolyVoxCore)
 
-#Set up the C++11 feature header file based on the CheckCXX11Features script
-CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/include/PolyVoxCore/Impl/CompilerCapabilities.h.in ${CMAKE_CURRENT_BINARY_DIR}/include/PolyVoxCore/Impl/CompilerCapabilities.h)
+if(NOT MSVC)
+	#Set up the C++11 feature header file based on the CheckCXX11Features script
+	CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/include/PolyVoxCore/Impl/CompilerCapabilities.h.in ${CMAKE_CURRENT_BINARY_DIR}/include/PolyVoxCore/Impl/CompilerCapabilities.h)
+endif()
 
 #Projects source files
 SET(CORE_SRC_FILES