Updated support files to enable SPICE on MSVC14

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) {

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)

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()

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})