Commit 7e7908e1 authored by Michael Turner's avatar Michael Turner

slight update

parent 72c8b0db
...@@ -54,17 +54,6 @@ INCLUDE(CMakeParseArguments) ...@@ -54,17 +54,6 @@ INCLUDE(CMakeParseArguments)
# Enable CTest. # Enable CTest.
ENABLE_TESTING() ENABLE_TESTING()
# Use the CMake 2.4 policy for CMake 2.6
#IF(COMMAND cmake_policy)
# CMAKE_POLICY(SET CMP0003 OLD)
# Silence warnings when using generator expressions in
# TARGET_LINK_LIBRARIES.
# IF(POLICY CMP0022)
# CMAKE_POLICY(SET CMP0022 NEW)
# ENDIF()
#ENDIF(COMMAND cmake_policy)
# Find the modules included with Nektar # Find the modules included with Nektar
SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH}) SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
...@@ -131,10 +120,6 @@ SET(NEKTAR_LIBRARY_TYPE "SHARED") ...@@ -131,10 +120,6 @@ SET(NEKTAR_LIBRARY_TYPE "SHARED")
SET(CMAKE_SKIP_BUILD_RPATH FALSE) SET(CMAKE_SKIP_BUILD_RPATH FALSE)
SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
SET(CMAKE_INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${LIB_DIR}") SET(CMAKE_INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${LIB_DIR}")
#IF (APPLE)
# SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
# SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_DIR}")
#ENDIF()
LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
"${CMAKE_INSTALL_PREFIX}/${LIB_DIR}" isSystemDir) "${CMAKE_INSTALL_PREFIX}/${LIB_DIR}" isSystemDir)
IF("${isSystemDir}" STREQUAL "-1") IF("${isSystemDir}" STREQUAL "-1")
...@@ -193,6 +178,10 @@ CMAKE_DEPENDENT_OPTION(NEKTAR_USE_MKL ...@@ -193,6 +178,10 @@ CMAKE_DEPENDENT_OPTION(NEKTAR_USE_MKL
CMAKE_DEPENDENT_OPTION(NEKTAR_USE_ACCELERATE_FRAMEWORK CMAKE_DEPENDENT_OPTION(NEKTAR_USE_ACCELERATE_FRAMEWORK
"Use the Mac Accelerate Framework for BLAS and Lapack support." ON "Use the Mac Accelerate Framework for BLAS and Lapack support." ON
"NOT NEKTAR_USE_SYSTEM_BLAS_LAPACK; APPLE" OFF) "NOT NEKTAR_USE_SYSTEM_BLAS_LAPACK; APPLE" OFF)
CMAKE_DEPENDENT_OPTION(NEKTAR_USE_WIN32_LAPACK
"Use Win32 Lapack provided with the Third Party Distribution."
ON "NOT NEKTAR_USE_SYSTEM_BLAS_LAPACK; WIN32" OFF)
# Memory pools # Memory pools
OPTION(NEKTAR_USE_MEMORY_POOLS OPTION(NEKTAR_USE_MEMORY_POOLS
...@@ -249,14 +238,10 @@ INCLUDE (Doxygen) ...@@ -249,14 +238,10 @@ INCLUDE (Doxygen)
IF( NEKTAR_USE_MKL ) IF( NEKTAR_USE_MKL )
INCLUDE (FindMKL) INCLUDE (FindMKL)
ENDIF( NEKTAR_USE_MKL ) ELSEIF( NEKTAR_USE_WIN32_LAPACK )
INCLUDE (FindWin32Lapack)
IF( NEKTAR_USE_SYSTEM_BLAS_LAPACK OR ELSE()
NEKTAR_USE_OPENBLAS OR INCLUDE(ThirdPartyBlasLapack)
NEKTAR_USE_ACCELERATE_FRAMEWORK OR
NEKTAR_USE_ACML)
INCLUDE(ThirdPartyBlasLapack)
ENDIF() ENDIF()
IF( NEKTAR_USE_TINYXML_STL ) IF( NEKTAR_USE_TINYXML_STL )
......
...@@ -46,16 +46,16 @@ IF(THIRDPARTY_BUILD_BLAS_LAPACK) ...@@ -46,16 +46,16 @@ IF(THIRDPARTY_BUILD_BLAS_LAPACK)
${TPSRC}/lapack-3.7.0 ${TPSRC}/lapack-3.7.0
) )
SET(BLAS_LAPACK ${NATIVE_BLAS} ${NATIVE_LAPACK}) SET(BLAS_LAPACK blas lapack)
LINK_DIRECTORIES(${TPDIST}/lib) LINK_DIRECTORIES(${TPDIST}/lib)
INCLUDE_DIRECTORIES(${TPDIST}/include) INCLUDE_DIRECTORIES(${TPDIST}/include)
IF (WIN32) IF (WIN32)
MESSAGE(STATUS "Build blas: ${TPDIST}/${LIB_DIR}/${NATIVE_BLAS}.dll") MESSAGE(STATUS "Build blas: ${TPDIST}/${LIB_DIR}/libblas.dll")
MESSAGE(STATUS "Build lapack: ${TPDIST}/${LIB_DIR}/${NATIVE_LAPACK}.dll") MESSAGE(STATUS "Build lapack: ${TPDIST}/${LIB_DIR}/liblapack.dll")
ELSE () ELSE ()
MESSAGE(STATUS "Build blas: ${TPDIST}/${LIB_DIR}/lib${NATIVE_BLAS}.a") MESSAGE(STATUS "Build blas: ${TPDIST}/${LIB_DIR}/libblas.a")
MESSAGE(STATUS "Build lapack: ${TPDIST}/${LIB_DIR}/${NATIVE_LAPACK}.a") MESSAGE(STATUS "Build lapack: ${TPDIST}/${LIB_DIR}/liblapack.a")
ENDIF() ENDIF()
ENDIF() ENDIF()
...@@ -384,7 +384,6 @@ TARGET_LINK_LIBRARIES(LibUtilities LINK_PUBLIC ...@@ -384,7 +384,6 @@ TARGET_LINK_LIBRARIES(LibUtilities LINK_PUBLIC
${Boost_PROGRAM_OPTIONS_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY}
${Boost_FILESYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY}
${Boost_SYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY}
#debug ${ZLIB_LIBRARY_DEBUG} optimized
${ZLIB_LIBRARY_RELEASE} ${ZLIB_LIBRARY_RELEASE}
) )
......
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