Turned expression templates off by default for Visual Studio x64.

Updated boost to look for 1.40 first.


git-svn-id: https://gforge.sci.utah.edu/svn/nektar/trunk@2059 305cdda6-5ce1-45b3-a98d-dfc68c8b3305

library/CMakeLists.txt

@@ -31,11 +31,11 @@ ENDIF (${CMAKE_COMPILER_IS_GNUCXX})
 SET(NEKTAR_BUILD_DEMOS ON CACHE BOOL "Build Demo Projects")
 SET(NEKTAR_BUILD_UNIT_TESTS OFF CACHE BOOL "Build Unit Tests Projects")
 
-IF( ${CMAKE_GENERATOR} STREQUAL "Visual Studio 8 2005" OR ${CMAKE_GENERATOR} STREQUAL "Visual Studio 9 2008" )
+IF( ${CMAKE_GENERATOR} STREQUAL "Visual Studio 8 2005" OR ${CMAKE_GENERATOR} STREQUAL "Visual Studio 9 2008" OR ${CMAKE_GENERATOR} STREQUAL "Visual Studio 9 2008 Win64" )
 	SET(ExpressionTemplateDefault OFF)
-ELSE( ${CMAKE_GENERATOR} STREQUAL "Visual Studio 8 2005" OR ${CMAKE_GENERATOR} STREQUAL "Visual Studio 9 2008" )
+ELSE( ${CMAKE_GENERATOR} STREQUAL "Visual Studio 8 2005" OR ${CMAKE_GENERATOR} STREQUAL "Visual Studio 9 2008" OR ${CMAKE_GENERATOR} STREQUAL "Visual Studio 9 2008 Win64" )
 	SET(ExpressionTemplateDefault ON)
-ENDIF( ${CMAKE_GENERATOR} STREQUAL "Visual Studio 8 2005" OR ${CMAKE_GENERATOR} STREQUAL "Visual Studio 9 2008" )
+ENDIF( ${CMAKE_GENERATOR} STREQUAL "Visual Studio 8 2005" OR ${CMAKE_GENERATOR} STREQUAL "Visual Studio 9 2008" OR ${CMAKE_GENERATOR} STREQUAL "Visual Studio 9 2008 Win64" )
 
 SET(NEKTAR_USE_EXPRESSION_TEMPLATES ${ExpressionTemplateDefault} CACHE BOOL "")
 
@@ -91,8 +91,8 @@ ENDIF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
 SET(Boost_USE_MULTITHREAD ON)
 SET(BOOST_ROOT ${CMAKE_SOURCE_DIR}/../ThirdParty/boost 
   ${CMAKE_SOURCE_DIR}/../../ThirdParty/boost)
-SET(Boost_ADDITIONAL_VERSIONS "1.35.0" "1.35")
-FIND_PACKAGE( Boost 1.35.0 REQUIRED COMPONENTS thread iostreams zlib date_time)
+SET(Boost_ADDITIONAL_VERSIONS "1.40" "1.40.0" "1.35.0" "1.35")
+FIND_PACKAGE( Boost 1.40.0 REQUIRED COMPONENTS thread iostreams zlib date_time)
 
 
 INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} ${Boost_INCLUDE_DIRS} ${LOKI_INCLUDE_DIR} ${TINYXML_BASE})