Commit b3e81914 authored by Dave Moxey's avatar Dave Moxey
Browse files

Fix METIS, support THIRDPARTY_BUILD_BOOST with MSVC 12

parent 0bc35e45
...@@ -136,30 +136,29 @@ IF( WIN32 ) ...@@ -136,30 +136,29 @@ IF( WIN32 )
FIND_LIBRARY( WIN32_BLAS NAMES libblas64 PATHS ${CMAKE_SOURCE_DIR}/ThirdParty ${CMAKE_SOURCE_DIR}/../ThirdParty ) FIND_LIBRARY( WIN32_BLAS NAMES libblas64 PATHS ${CMAKE_SOURCE_DIR}/ThirdParty ${CMAKE_SOURCE_DIR}/../ThirdParty )
FIND_LIBRARY( WIN32_LAPACK NAMES liblapack64 PATHS ${CMAKE_SOURCE_DIR}/ThirdParty ${CMAKE_SOURCE_DIR}/../ThirdParty ) FIND_LIBRARY( WIN32_LAPACK NAMES liblapack64 PATHS ${CMAKE_SOURCE_DIR}/ThirdParty ${CMAKE_SOURCE_DIR}/../ThirdParty )
ELSE() ELSE()
FIND_LIBRARY( WIN32_BLAS NAMES blas_win32 PATHS ${CMAKE_SOURCE_DIR}/ThirdParty ${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 ) FIND_LIBRARY( WIN32_LAPACK NAMES lapack_win32 PATHS ${CMAKE_SOURCE_DIR}/ThirdParty ${CMAKE_SOURCE_DIR}/../ThirdParty )
ENDIF() ENDIF()
IF( WIN32_BLAS AND WIN32_LAPACK ) IF( WIN32_BLAS AND WIN32_LAPACK )
SET(Win32LapackDefault ON) SET(Win32LapackDefault ON)
ELSE(WIN32_BLAS AND WIN32_LAPACK) ELSE(WIN32_BLAS AND WIN32_LAPACK)
SET(Win32LapackDefault OFF) SET(Win32LapackDefault OFF)
ENDIF(WIN32_BLAS AND WIN32_LAPACK) ENDIF(WIN32_BLAS AND WIN32_LAPACK)
ELSE(WIN32) ELSE(WIN32)
SET(Win32LapackDefault OFF) SET(Win32LapackDefault OFF)
ENDIF(WIN32) ENDIF(WIN32)
IF( MSVC ) IF (MSVC)
# Needed for M_PI to be visible in visual studio. # Needed for M_PI to be visible in visual studio.
ADD_DEFINITIONS(-D_USE_MATH_DEFINES) ADD_DEFINITIONS(-D_USE_MATH_DEFINES)
# Removes the warnings about unsafe methods such as strcpy, std::copy, # Removes the warnings about unsafe methods such as strcpy, std::copy,
# memcmp, etc. # memcmp, etc.
ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_DEPRECATE) ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_DEPRECATE)
ENDIF( ) ENDIF()
CMAKE_DEPENDENT_OPTION(NEKTAR_USE_WIN32_LAPACK DEPENDENT_OPTION(NEKTAR_USE_WIN32_LAPACK
"Use Win32 Lapack provided with the Third Party Distribution." "Use Win32 Lapack provided with the Third Party Distribution."
${Win32LapackDefault} "NEKTAR_USE_BLAS_LAPACK; WIN32" OFF) ${Win32LapackDefault} "NEKTAR_USE_BLAS_LAPACK; WIN32" OFF)
......
...@@ -106,59 +106,30 @@ IF (THIRDPARTY_BUILD_BOOST) ...@@ -106,59 +106,30 @@ IF (THIRDPARTY_BUILD_BOOST)
ENDIF(THIRDPARTY_BUILD_ZLIB) ENDIF(THIRDPARTY_BUILD_ZLIB)
# Set up CMake variables # Set up CMake variables
IF (WIN32) SET(Boost_DATE_TIME_LIBRARY boost_date_time)
SET(Boost_DATE_TIME_LIBRARY libboost_date_time) SET(Boost_DATE_TIME_LIBRARY_DEBUG boost_date_time)
SET(Boost_DATE_TIME_LIBRARY_DEBUG libboost_date_time) SET(Boost_DATE_TIME_LIBRARY_RELEASE boost_date_time)
SET(Boost_DATE_TIME_LIBRARY_RELEASE libboost_date_time) SET(Boost_FILESYSTEM_LIBRARY boost_filesystem)
SET(Boost_FILESYSTEM_LIBRARY libboost_filesystem) SET(Boost_FILESYSTEM_LIBRARY_DEBUG boost_filesystem)
SET(Boost_FILESYSTEM_LIBRARY_DEBUG libboost_filesystem) SET(Boost_FILESYSTEM_LIBRARY_RELEASE boost_filesystem)
SET(Boost_FILESYSTEM_LIBRARY_RELEASE libboost_filesystem) SET(Boost_IOSTREAMS_LIBRARY boost_iostreams)
SET(Boost_IOSTREAMS_LIBRARY libboost_iostreams) SET(Boost_IOSTREAMS_LIBRARY_DEBUG boost_iostreams)
SET(Boost_IOSTREAMS_LIBRARY_DEBUG libboost_iostreams) SET(Boost_IOSTREAMS_LIBRARY_RELEASE boost_iostreams)
SET(Boost_IOSTREAMS_LIBRARY_RELEASE libboost_iostreams) SET(Boost_PROGRAM_OPTIONS_LIBRARY boost_program_options)
SET(Boost_PROGRAM_OPTIONS_LIBRARY libboost_program_options) SET(Boost_PROGRAM_OPTIONS_LIBRARY_DEBUG boost_program_options)
SET(Boost_PROGRAM_OPTIONS_LIBRARY_DEBUG libboost_program_options) SET(Boost_PROGRAM_OPTIONS_LIBRARY_RELEASE boost_program_options)
SET(Boost_PROGRAM_OPTIONS_LIBRARY_RELEASE libboost_program_options) SET(Boost_REGEX_LIBRARY boost_regex)
SET(Boost_REGEX_LIBRARY libboost_regex) SET(Boost_REGEX_LIBRARY_DEBUG boost_regex)
SET(Boost_REGEX_LIBRARY_DEBUG libboost_regex) SET(Boost_REGEX_LIBRARY_RELEASE boost_regex)
SET(Boost_REGEX_LIBRARY_RELEASE libboost_regex) SET(Boost_SYSTEM_LIBRARY boost_system)
SET(Boost_SYSTEM_LIBRARY libboost_system) SET(Boost_SYSTEM_LIBRARY_DEBUG boost_system)
SET(Boost_SYSTEM_LIBRARY_DEBUG libboost_system) SET(Boost_SYSTEM_LIBRARY_RELEASE boost_system)
SET(Boost_SYSTEM_LIBRARY_RELEASE libboost_system) SET(Boost_THREAD_LIBRARY boost_thread)
SET(Boost_THREAD_LIBRARY libboost_thread) SET(Boost_THREAD_LIBRARY_DEBUG boost_thread)
SET(Boost_THREAD_LIBRARY_DEBUG libboost_thread) SET(Boost_THREAD_LIBRARY_RELEASE boost_thread)
SET(Boost_THREAD_LIBRARY_RELEASE libboost_thread) SET(Boost_INCLUDE_DIRS ${TPSRC}/dist/include)
SET(Boost_INCLUDE_DIRS ${TPDIST}/include) SET(Boost_LIBRARY_DIRS ${TPSRC}/dist/lib)
SET(Boost_LIBRARY_DIRS ${TPDIST}/lib) LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
MESSAGE(STATUS ${Boost_DATE_TIME_LIBRARY})
LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
ELSE()
SET(Boost_DATE_TIME_LIBRARY boost_date_time)
SET(Boost_DATE_TIME_LIBRARY_DEBUG boost_date_time)
SET(Boost_DATE_TIME_LIBRARY_RELEASE boost_date_time)
SET(Boost_FILESYSTEM_LIBRARY boost_filesystem)
SET(Boost_FILESYSTEM_LIBRARY_DEBUG boost_filesystem)
SET(Boost_FILESYSTEM_LIBRARY_RELEASE boost_filesystem)
SET(Boost_IOSTREAMS_LIBRARY boost_iostreams)
SET(Boost_IOSTREAMS_LIBRARY_DEBUG boost_iostreams)
SET(Boost_IOSTREAMS_LIBRARY_RELEASE boost_iostreams)
SET(Boost_PROGRAM_OPTIONS_LIBRARY boost_program_options)
SET(Boost_PROGRAM_OPTIONS_LIBRARY_DEBUG boost_program_options)
SET(Boost_PROGRAM_OPTIONS_LIBRARY_RELEASE boost_program_options)
SET(Boost_REGEX_LIBRARY boost_regex)
SET(Boost_REGEX_LIBRARY_DEBUG boost_regex)
SET(Boost_REGEX_LIBRARY_RELEASE boost_regex)
SET(Boost_SYSTEM_LIBRARY boost_system)
SET(Boost_SYSTEM_LIBRARY_DEBUG boost_system)
SET(Boost_SYSTEM_LIBRARY_RELEASE boost_system)
SET(Boost_THREAD_LIBRARY boost_thread)
SET(Boost_THREAD_LIBRARY_DEBUG boost_thread)
SET(Boost_THREAD_LIBRARY_RELEASE boost_thread)
SET(Boost_INCLUDE_DIRS ${TPSRC}/dist/include
${TPSRC}/dist/include/boost-1_49)
SET(Boost_LIBRARY_DIRS ${TPSRC}/dist/lib)
LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
ENDIF()
ELSE (THIRDPARTY_BUILD_BOOST) ELSE (THIRDPARTY_BUILD_BOOST)
ADD_CUSTOM_TARGET(boost ALL) ADD_CUSTOM_TARGET(boost ALL)
SET(Boost_DEBUG 0) SET(Boost_DEBUG 0)
......
...@@ -6,8 +6,8 @@ IF (THIRDPARTY_BUILD_METIS) ...@@ -6,8 +6,8 @@ IF (THIRDPARTY_BUILD_METIS)
EXTERNALPROJECT_ADD( EXTERNALPROJECT_ADD(
modmetis-5.1.0 modmetis-5.1.0
PREFIX ${TPSRC} PREFIX ${TPSRC}
URL ${TPURL}/modmetis-5.1.0_1.tar.bz2 URL http://ae-nektar.ae.ic.ac.uk/~dmoxey/modmetis-5.1.0_2.tar.bz2
URL_MD5 "6c6816aea0f53db6c71b1d98ed4ad42b" URL_MD5 "8a1f1afd39b46a4477c1ea15464cdf89"
STAMP_DIR ${TPBUILD}/stamp STAMP_DIR ${TPBUILD}/stamp
DOWNLOAD_DIR ${TPSRC} DOWNLOAD_DIR ${TPSRC}
SOURCE_DIR ${TPSRC}/modmetis-5.1.0 SOURCE_DIR ${TPSRC}/modmetis-5.1.0
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment