From fbc501450a4ffe30e8b143c60b3092b72a46e930 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Mon, 23 Nov 2015 22:24:13 -0500
Subject: [PATCH] Updated support files to enable SPICE on MSVC14

---
 src/engine/wrapper/sgctwindowwrapper.cpp | 3 +++
 support/cmake/FindSGCT.cmake             | 2 ++
 support/cmake/FindSpice.cmake            | 9 ++++++---
 support/cmake/support_macros.cmake       | 2 +-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/engine/wrapper/sgctwindowwrapper.cpp b/src/engine/wrapper/sgctwindowwrapper.cpp
index d24920f091..3ea2257658 100644
--- a/src/engine/wrapper/sgctwindowwrapper.cpp
+++ b/src/engine/wrapper/sgctwindowwrapper.cpp
@@ -27,6 +27,9 @@
 
 #include <openspace/engine/wrapper/sgctwindowwrapper.h>
 
+#undef near
+#undef far
+
 namespace openspace {
     
 void SGCTWindowWrapper::setBarrier(bool enabled) {
diff --git a/support/cmake/FindSGCT.cmake b/support/cmake/FindSGCT.cmake
index 4a01c0a15e..eedf04c3f2 100644
--- a/support/cmake/FindSGCT.cmake
+++ b/support/cmake/FindSGCT.cmake
@@ -46,6 +46,8 @@ if(WIN32)
         set(SGCT_LIBRARY_FOLDER "${SGCT_ROOT_DIR}/lib/msvc11")
     elseif (MSVC12)
         set(SGCT_LIBRARY_FOLDER "${SGCT_ROOT_DIR}/lib/msvc12")
+    elseif (MSVC14)
+        set(SGCT_LIBRARY_FOLDER "${SGCT_ROOT_DIR}/lib/msvc14")
     endif (MSVC10)
     
     if (CMAKE_CL_64)
diff --git a/support/cmake/FindSpice.cmake b/support/cmake/FindSpice.cmake
index 5c63a4c5ab..388d196354 100644
--- a/support/cmake/FindSpice.cmake
+++ b/support/cmake/FindSpice.cmake
@@ -1,9 +1,12 @@
-
-
 set(SPICE_INCLUDE_DIR "${SPICE_ROOT_DIR}/include")
 
 if(WIN32)
-    set(SPICE_LIBRARY "${SPICE_ROOT_DIR}/lib/msvc12/cspice.lib")
+	if (${MSVC_VERSION} EQUAL 1800)
+	    set(SPICE_LIBRARY "${SPICE_ROOT_DIR}/lib/msvc12/cspice.lib")
+	endif ()
+	if (${MSVC_VERSION} EQUAL 1900)
+    	set(SPICE_LIBRARY "${SPICE_ROOT_DIR}/lib/msvc14/cspice.lib")
+    endif ()
 elseif(APPLE)
     set(SPICE_LIBRARY "${SPICE_ROOT_DIR}/lib/gcc_osx/cspice.a")
 else()
diff --git a/support/cmake/support_macros.cmake b/support/cmake/support_macros.cmake
index dff35e5e66..1904a4cf54 100644
--- a/support/cmake/support_macros.cmake
+++ b/support/cmake/support_macros.cmake
@@ -140,7 +140,7 @@ function (add_external_dependencies)
     set_property(TARGET lz4 PROPERTY FOLDER "External")
     set_property(TARGET tinyobjloader PROPERTY FOLDER "External")
 
-    # # SGCT
+    # SGCT
     find_package(SGCT REQUIRED)
     target_include_directories(libOpenSpace SYSTEM PUBLIC ${SGCT_INCLUDE_DIRECTORIES})
     target_link_libraries(libOpenSpace ${SGCT_LIBRARIES})