Merge pull request #174 from GordonSmith/VS2015

GH-173 Add support for VS2015 Reviewed-By: Xiaoming Wang <xiaoming.wang@lexisnexis.com> Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
hpcc-systems · Sep 22, 2015 · 6bcd663 · 6bcd663
2 parents ebfc8f4 + 65d9639
commit 6bcd663
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/cmake/Modules/Externals.cmake b/cmake/Modules/Externals.cmake
@@ -15,9 +15,9 @@ if ( WIN32 AND EXTERNALS_DIRECTORY )
     set ( FREETYPE_INCLUDE_DIR_freetype2 "${EXTERNALS_DIRECTORY}/ft248/freetype-2.4.8/include" )
     set ( FREETYPE_INCLUDE_DIR_ft2build "${EXTERNALS_DIRECTORY}/ft248/freetype-2.4.8/include" )
     set ( FREETYPE_INCLUDE_DIRS ${FREETYPE_INCLUDE_DIR_freetype2} ${FREETYPE_INCLUDE_DIR_ft2build} )
-    set ( FREETYPE_LIBRARY "${EXTERNALS_DIRECTORY}/ft248/freetype-2.4.8/objs/win32/vc2010/freetype248MT.lib" )
-    set ( BOOST_INCLUDEDIR "${EXTERNALS_DIRECTORY}/Boost/include/boost-1_44" CACHE PATH "Boost headers folder" )
-    set ( BOOST_LIBRARYDIR "${EXTERNALS_DIRECTORY}/Boost/windows-i386-vc100" CACHE PATH "Boost libraries folder" )
+    set ( FREETYPE_LIBRARY "${EXTERNALS_DIRECTORY}/ft248/freetype-2.4.8/objs/win32/vc2015/freetype248MT.lib" )
+    set ( BOOST_INCLUDEDIR "${EXTERNALS_DIRECTORY}/Boost/include/boost-1_58" CACHE PATH "Boost headers folder" )
+    set ( BOOST_LIBRARYDIR "${EXTERNALS_DIRECTORY}/Boost/windows-i386-vc140" CACHE PATH "Boost libraries folder" )
 else ( WIN32 AND EXTERNALS_DIRECTORY )
     find_package( EXPAT )
     if ( EXPAT_FOUND )