Commit a61a9159 authored by Blake Nelson's avatar Blake Nelson

*** empty log message ***


git-svn-id: https://gforge.sci.utah.edu/svn/nektar/trunk@1326 305cdda6-5ce1-45b3-a98d-dfc68c8b3305
parent 018fd1c4
......@@ -2,7 +2,6 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
PROJECT(Nektar++)
INCLUDE(CMakeExportBuildSettings)
INCLUDE(NektarCommon.cmake)
# Use the CMake 2.4 policy for CMake 2.6
if(COMMAND cmake_policy)
......@@ -13,11 +12,7 @@ endif(COMMAND cmake_policy)
SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR} ${CMAKE_MODULE_PATH})
SET(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/dist CACHE FILEPATH "" FORCE)
SET(NEKTAR_USE_MKL OFF CACHE BOOL "Use the Intel Math Kernel Library (MKL) for BLAS and Lapack support." )
IF( APPLE )
SET(NEKTAR_USE_FRAMEWORK ON CACHE BOOL "Use the Mac Framework system for BLAS and Lapack support." )
ENDIF(APPLE)
INCLUDE(NektarCommon)
# Turn on NEKTAR_USE_WIN32_LAPACK if we are in Windows and the libraries exist.
IF( WIN32 )
......@@ -32,11 +27,6 @@ ELSE(WIN32)
SET(Win32LapackDefault OFF)
ENDIF(WIN32)
SET(NEKTAR_USE_ACML OFF CACHE BOOL "Use the AMD Core Math Library (ACML) for BLAS and Lapack support." )
SET(NEKTAR_USE_ATLAS OFF CACHE BOOL "Use ATLAS for BLAS and Lapack support." )
SET(NEKTAR_USE_WIN32_LAPACK ${Win32LapackDefault} CACHE BOOL "Use Win32 Lapack provided with the Third Party Distribution.")
SET(NEKTAR_USE_MEMORY_POOLS ON CACHE BOOL "Use memory pools to accelerate memory allocation.")
SET(NEKTAR_USE_BLAS_LAPACK ON CACHE BOOL "Use Blas and lapack routines.")
SET(NEKTAR_USE_METIS OFF CACHE BOOL "Use Metis routines for partitioning and reordering graphs.")
SET(NEKTAR_USE_TINYXML_STL ON CACHE BOOL "Use STL with TinyXML library.")
SET(NEKTAR_USE_DIRECT_BLAS_CALLS OFF CACHE BOOL "Use direct BLAS calls rather than NekMatrix calls in the StdRegions and LocalRegions sublibrary")
......@@ -55,7 +45,7 @@ SET(NEKTAR_USE_EXPRESSION_TEMPLATES ${ExpressionTemplateDefault} CACHE BOOL "")
MARK_AS_ADVANCED(NEKTAR_USE_DIRECT_BLAS_CALLS)
MARK_AS_ADVANCED(NEKTAR_FULL_DEBUG)
MARK_AS_ADVANCED(NEKTAR_USE_MEMORY_POOLS)
MARK_AS_ADVANCED(NEKTAR_USE_BLAS_LAPACK)
MARK_AS_ADVANCED(NEKTAR_USE_PRECOMPILED_HEADERS)
MARK_AS_ADVANCED(NEKTAR_USE_EXPRESSION_TEMPLATES)
......@@ -71,29 +61,12 @@ INCLUDE (FindTinyXml)
FIND_PACKAGE( Boost 1.35.0 REQUIRED COMPONENTS thread iostreams zlib )
IF( NEKTAR_USE_MKL )
INCLUDE (FindMKL)
ENDIF( NEKTAR_USE_MKL )
IF( NEKTAR_USE_FRAMEWORK )
INCLUDE (FindFramework)
ENDIF( NEKTAR_USE_FRAMEWORK )
IF( NEKTAR_USE_METIS )
FIND_PACKAGE(Metis REQUIRED)
ENDIF( NEKTAR_USE_METIS )
IF( NEKTAR_USE_ATLAS )
INCLUDE( FindAtlas )
ENDIF( NEKTAR_USE_ATLAS )
IF( NEKTAR_USE_ACML )
INCLUDE (FindACML)
ENDIF( NEKTAR_USE_ACML )
IF( NEKTAR_USE_WIN32_LAPACK )
INCLUDE (FindWin32Lapack.cmake)
ENDIF( NEKTAR_USE_WIN32_LAPACK )
INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} ${Boost_INCLUDE_DIRS} ${LOKI_INCLUDE_DIR} ${TINYXML_BASE})
......@@ -179,29 +152,6 @@ ELSE( NEKTAR_USE_PRECOMPILED_HEADERS )
REMOVE_DEFINITIONS(-DNEKTAR_USE_PRECOMPILED_HEADERS)
ENDIF( NEKTAR_USE_PRECOMPILED_HEADERS )
IF( NEKTAR_USE_MKL )
SET(NEKTAR_USING_BLAS TRUE)
SET(NEKTAR_USING_LAPACK TRUE)
SET(NEKTAR_USING_MKL TRUE)
ADD_DEFINITIONS(-DNEKTAR_USING_LAPACK -DNEKTAR_USING_BLAS)
ENDIF( NEKTAR_USE_MKL )
IF( NEKTAR_USE_ATLAS )
SET(NEKTAR_USING_BLAS TRUE)
SET(NEKTAR_USING_ATLAS TRUE)
ADD_DEFINITIONS(-DNEKTAR_USING_LAPACK -DNEKTAR_USING_BLAS)
ENDIF( NEKTAR_USE_ATLAS )
IF( NEKTAR_USE_ACML )
SET(NEKTAR_USING_BLAS TRUE)
SET(NEKTAR_USING_LAPACK TRUE)
SET(NEKTAR_USING_ACML TRUE)
ADD_DEFINITIONS(-DNEKTAR_USING_LAPACK -DNEKTAR_USING_BLAS -DUSE_ACML)
ENDIF( NEKTAR_USE_ACML )
IF( NEKTAR_USE_BLAS_LAPACK )
ADD_DEFINITIONS( -DNEKTAR_USING_LAPACK -DNEKTAR_USING_BLAS )
ENDIF( NEKTAR_USE_BLAS_LAPACK )
IF( NEKTAR_USE_TINYXML_STL )
ADD_DEFINITIONS( -DTIXML_USE_STL)
......@@ -295,12 +245,13 @@ MACRO(ADD_NEKTAR_EXECUTABLE name sources)
INSTALL(TARGETS ${name} RUNTIME DESTINATION ${NEKTAR_BIN_DIR} OPTIONAL
ARCHIVE DESTINATION ${NEKTAR_LIB_DIR} OPTIONAL
LIBRARY DESTINATION ${NEKTAR_LIB_DIR} OPTIONAL)
ENDMACRO(ADD_NEKTAR_EXECUTABLE name sources)
SET(LibrarySubDirs LibUtilities LocalRegions MultiRegions SpatialDomains
StdRegions Stochastic Profile)
StdRegions Stochastic)
SET(UnitTestSubDirs UnitTests)
SET(DemoSubDirs Demos)
......@@ -314,10 +265,16 @@ CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/Nektar++Config.cmake.in
INSTALL(FILES ${CMAKE_BINARY_DIR}/Nektar++Config.cmake
${CMAKE_SOURCE_DIR}/FindBoost.cmake
${CMAKE_SOURCE_DIR}/FindLoki.cmake
${CMAKE_SOURCE_DIR}/FindFramework.cmake
${CMAKE_SOURCE_DIR}/FindACML.cmake
${CMAKE_SOURCE_DIR}/FindAtlas.cmake
${CMAKE_SOURCE_DIR}/FindMKL.cmake
${CMAKE_SOURCE_DIR}/FindWin32Lapack.cmake
${CMAKE_SOURCE_DIR}/NektarCommon.cmake
${CMAKE_SOURCE_DIR}/FindTinyXml.cmake
${CMAKE_SOURCE_DIR}/NektarCommon.cmake
DESTINATION ${CMAKE_INSTALL_PREFIX})
INSTALL(EXPORT Nektar++Libraries DESTINATION lib)
CMAKE_EXPORT_BUILD_SETTINGS("Nektar++BuildSettings.cmake")
......@@ -4,6 +4,8 @@ SET(Boost_USE_MULTITHREAD "@Boost_USE_MULTITHREAD@")
SET(BOOST_ROOT "@BOOST_ROOT@")
SET(Boost_ADDITIONAL_VERSIONS "@Boost_ADDITIONAL_VERSIONS@")
SET(CMAKE_MODULE_PATH ${NEKTAR++_ROOT_DIR} ${CMAKE_MODULE_PATH})
FIND_PACKAGE( Boost 1.35.0 REQUIRED COMPONENTS thread )
INCLUDE(${NEKTAR++_ROOT_DIR}/FindLoki.cmake)
INCLUDE(${NEKTAR++_ROOT_DIR}/FindTinyXml.cmake)
......
SET(NEKTAR_USE_MKL OFF CACHE BOOL "Use the Intel Math Kernel Library (MKL) for BLAS and Lapack support." )
IF( APPLE )
SET(NEKTAR_USE_FRAMEWORK ON CACHE BOOL "Use the Mac Framework system for BLAS and Lapack support." )
ENDIF(APPLE)
SET(NEKTAR_USE_ACML OFF CACHE BOOL "Use the AMD Core Math Library (ACML) for BLAS and Lapack support." )
SET(NEKTAR_USE_ATLAS OFF CACHE BOOL "Use ATLAS for BLAS and Lapack support." )
SET(NEKTAR_USE_WIN32_LAPACK ${Win32LapackDefault} CACHE BOOL "Use Win32 Lapack provided with the Third Party Distribution.")
SET(NEKTAR_USE_MEMORY_POOLS ON CACHE BOOL "Use memory pools to accelerate memory allocation.")
SET(NEKTAR_USE_BLAS_LAPACK ON CACHE BOOL "Use Blas and lapack routines.")
MARK_AS_ADVANCED(NEKTAR_USE_BLAS_LAPACK)
IF( NEKTAR_USE_MKL )
INCLUDE (FindMKL)
ENDIF( NEKTAR_USE_MKL )
IF( NEKTAR_USE_FRAMEWORK )
INCLUDE (FindFramework)
ENDIF( NEKTAR_USE_FRAMEWORK )
IF( NEKTAR_USE_ATLAS )
INCLUDE( FindAtlas )
ENDIF( NEKTAR_USE_ATLAS )
IF( NEKTAR_USE_ACML )
INCLUDE (FindACML)
ENDIF( NEKTAR_USE_ACML )
IF( NEKTAR_USE_WIN32_LAPACK )
INCLUDE (FindWin32Lapack.cmake)
ENDIF( NEKTAR_USE_WIN32_LAPACK )
IF( NEKTAR_USE_MKL )
SET(NEKTAR_USING_BLAS TRUE)
SET(NEKTAR_USING_LAPACK TRUE)
SET(NEKTAR_USING_MKL TRUE)
ADD_DEFINITIONS(-DNEKTAR_USING_LAPACK -DNEKTAR_USING_BLAS)
ENDIF( NEKTAR_USE_MKL )
IF( NEKTAR_USE_ATLAS )
SET(NEKTAR_USING_BLAS TRUE)
SET(NEKTAR_USING_ATLAS TRUE)
ADD_DEFINITIONS(-DNEKTAR_USING_LAPACK -DNEKTAR_USING_BLAS)
ENDIF( NEKTAR_USE_ATLAS )
IF( NEKTAR_USE_ACML )
SET(NEKTAR_USING_BLAS TRUE)
SET(NEKTAR_USING_LAPACK TRUE)
SET(NEKTAR_USING_ACML TRUE)
ADD_DEFINITIONS(-DNEKTAR_USING_LAPACK -DNEKTAR_USING_BLAS -DUSE_ACML)
ADD_DEFINITIONS(-DNEKTAR_USING_LAPACK -DNEKTAR_USING_BLAS)
ENDIF( NEKTAR_USE_ACML )
IF( NEKTAR_USE_BLAS_LAPACK )
ADD_DEFINITIONS( -DNEKTAR_USING_LAPACK -DNEKTAR_USING_BLAS )
ENDIF( NEKTAR_USE_BLAS_LAPACK )
MACRO(SET_LAPACK_LINK_LIBRARIES name)
IF( NEKTAR_USE_BLAS_LAPACK )
IF( NEKTAR_USE_MKL AND MKL_FOUND )
......
......@@ -28,17 +28,23 @@ SET(SourceFileNames
SET(HeaderFileNames
)
INCLUDE_DIRECTORIES(${NEKTAR++_INCLUDE_DIRS})
LINK_DIRECTORIES(${NEKTAR++_LIBRARY_DIRS})
ADD_DEFINITIONS(${NEKTAR++_DEFINITIONS})
IF( NEKTAR++_FOUND )
INCLUDE_DIRECTORIES(${NEKTAR++_INCLUDE_DIRS})
LINK_DIRECTORIES(${NEKTAR++_LIBRARY_DIRS})
ADD_DEFINITIONS(${NEKTAR++_DEFINITIONS})
ENDIF( NEKTAR++_FOUND )
ADD_EXECUTABLE(${ProjectName} ${SourceFileNames} ${HeaderFileNames})
# TODO - If your executable needs to link to any other libraries,
# add them here.
TARGET_LINK_LIBRARIES(${ProjectName}
IF( NEKTAR++_FOUND )
# TODO - If your executable needs to link to any other libraries,
# add them here.
TARGET_LINK_LIBRARIES(${ProjectName}
${NEKTAR++_LIBRARIES}
optimized ${Boost_THREAD_LIBRARY_RELEASE}
debug ${Boost_THREAD_LIBRARY_DEBUG})
SET_LAPACK_LINK_LIBRARIES(${ProjectName})
\ No newline at end of file
SET_LAPACK_LINK_LIBRARIES(${ProjectName})
ENDIF( NEKTAR++_FOUND )
......@@ -28,8 +28,8 @@ IF( NEKTAR++_FOUND )
ADD_DEFINITIONS(-DNEKTAR_MEMORY_POOL_ENABLED)
ELSE( NEKTAR_USE_MEMORY_POOLS )
REMOVE_DEFINITIONS(-DNEKTAR_MEMORY_POOL_ENABLED)
ENDIF( NEKTAR_USE_MEMORY_POOLS )
ENDIF( NEKTAR_USE_MEMORY_POOLS )
ELSE( NEKTAR++_FOUND )
SET(NEKTAR++_DEFINITIONS "")
SET(NEKTAR++_INCLUDE_DIRS "")
......
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