Update for Win32 CMake.

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

CMakeLists.txt

@@ -126,8 +126,8 @@ ENDIF(APPLE)
 
 # Turn on NEKTAR_USE_WIN32_LAPACK if we are in Windows and the libraries exist.
 IF( WIN32 )
-	FIND_LIBRARY( WIN32_BLAS NAMES blas_win32 PATHS ${CMAKE_SOURCE_DIR}/../ThirdParty )
-	FIND_LIBRARY( WIN32_LAPACK NAMES lapack_win32 PATHS ${CMAKE_SOURCE_DIR}/../ThirdParty )
+	FIND_LIBRARY( WIN32_BLAS NAMES blas_win32 PATHS ${CMAKE_SOURCE_DIR}/ThirdParty ${CMAKE_SOURCE_DIR}/../ThirdParty )
+	FIND_LIBRARY( WIN32_LAPACK NAMES lapack_win32 PATHS ${CMAKE_SOURCE_DIR}/ThirdParty ${CMAKE_SOURCE_DIR}/../ThirdParty )
 	IF( WIN32_BLAS AND WIN32_LAPACK )
 		SET(Win32LapackDefault ON)
     ELSE(WIN32_BLAS AND WIN32_LAPACK)
@@ -153,6 +153,8 @@ IF( NOT WIN32 )
     MARK_AS_ADVANCED(NEKTAR_USE_WIN32_LAPACK)
 ENDIF( NOT WIN32 )
 
+# Include Nektar++ common macros
+INCLUDE (NektarCommon)
 
 # Find Libraries
 INCLUDE (FindLoki)
@@ -283,9 +285,6 @@ ELSE( NEKTAR_USE_PRECOMPILED_HEADERS )
     REMOVE_DEFINITIONS(-DNEKTAR_USE_PRECOMPILED_HEADERS)
 ENDIF( NEKTAR_USE_PRECOMPILED_HEADERS )
 
-# Include Nektar++ common macros
-INCLUDE (NektarCommon)
-
 # Build active components
 IF (NEKTAR_BUILD_LIBRARY)
     SET(NEKTAR++_LIBRARIES LibUtilities StdRegions SpatialDomains LocalRegions