Skip to content
Snippets Groups Projects
Commit 072d4d58 authored by Blake Nelson's avatar Blake Nelson
Browse files

*** empty log message *** 

git-svn-id: https://gforge.sci.utah.edu/svn/nektar/trunk@1302 305cdda6-5ce1-45b3-a98d-dfc68c8b3305
parent 9de547a8
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
library/CMakeLists.txt
+ 14
− 37
View file @ 072d4d58
......@@ -2,6 +2,7 @@ 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)
......@@ -148,16 +149,16 @@ MACRO(ADD_NEKTAR_LIBRARY name type)
SET_COMMON_PROPERTIES(${name})
INSTALL(TARGETS ${name} RUNTIME DESTINATION ${NEKTAR_BIN_DIR} OPTIONAL
ARCHIVE DESTINATION ${NEKTAR_LIB_DIR} OPTIONAL
LIBRARY DESTINATION ${NEKTAR_LIB_DIR} OPTIONAL)
# INSTALL(TARGETS ${name} EXPORT ${name} RUNTIME DESTINATION ${NEKTAR_BIN_DIR} OPTIONAL
# INSTALL(TARGETS ${name} RUNTIME DESTINATION ${NEKTAR_BIN_DIR} OPTIONAL
# ARCHIVE DESTINATION ${NEKTAR_LIB_DIR} OPTIONAL
# LIBRARY DESTINATION ${NEKTAR_LIB_DIR} OPTIONAL)
# INSTALL(EXPORT ${name} DESTINATION proj)
INSTALL(TARGETS ${name} EXPORT Nektar++Libraries RUNTIME DESTINATION ${NEKTAR_BIN_DIR} OPTIONAL
ARCHIVE DESTINATION ${NEKTAR_LIB_DIR} OPTIONAL
LIBRARY DESTINATION ${NEKTAR_LIB_DIR} OPTIONAL)
ENDMACRO(ADD_NEKTAR_LIBRARY name type)
IF( NEKTAR_USE_EXPRESSION_TEMPLATES )
ADD_DEFINITIONS(-DNEKTAR_USE_EXPRESSION_TEMPLATES -DNEKTAR_USING_CMAKE)
ENDIF( NEKTAR_USE_EXPRESSION_TEMPLATES )
......@@ -273,36 +274,7 @@ MACRO(ADD_NEKTAR_EXECUTABLE name sources)
LIBRARY DESTINATION ${NEKTAR_LIB_DIR} OPTIONAL)
ENDMACRO(ADD_NEKTAR_EXECUTABLE name sources)
MACRO(SET_LAPACK_LINK_LIBRARIES name)
IF( NEKTAR_USE_BLAS_LAPACK )
IF( NEKTAR_USE_MKL AND MKL_FOUND )
TARGET_LINK_LIBRARIES(${name} ${MKL_LAPACK} optimized ${MKL} debug ${MKL} ${MKL_GUIDE})
ENDIF( NEKTAR_USE_MKL AND MKL_FOUND )
IF( NEKTAR_USE_ACML AND ACML_FOUND )
TARGET_LINK_LIBRARIES(${name} ${ACML_TARGET_LINK_LIBRARIES} )
ENDIF( NEKTAR_USE_ACML AND ACML_FOUND )
IF( NEKTAR_USE_FRAMEWORK )
TARGET_LINK_LIBRARIES(${name} ${FRAMEWORK_LINK_FLAGS})
ENDIF ( NEKTAR_USE_FRAMEWORK )
IF( NEKTAR_USE_WIN32_LAPACK )
TARGET_LINK_LIBRARIES(${name} ${WIN32_LAPACK} ${WIN32_BLAS})
ENDIF( NEKTAR_USE_WIN32_LAPACK )
IF( USE_ATLAS AND ATLAS_FOUND )
TARGET_LINK_LIBRARIES(${name}
${ATLAS_LAPACK}
${ATLAS_CBLAS}
${ATLAS} )
ENDIF( USE_ATLAS AND ATLAS_FOUND )
IF( NEKTAR_USE_METIS )
TARGET_LINK_LIBRARIES(${name} optimized ${METIS_LIB} debug ${METIS_LIB} )
ENDIF( NEKTAR_USE_METIS )
ENDIF( NEKTAR_USE_BLAS_LAPACK )
ENDMACRO(SET_LAPACK_LINK_LIBRARIES name)
SET(LibrarySubDirs LibUtilities LocalRegions MultiRegions SpatialDomains
StdRegions Stochastic Profile)
......@@ -316,6 +288,11 @@ ENDIF( NEKTAR_BUILD_DEMOS )
CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/Nektar++Config.cmake.in
${CMAKE_BINARY_DIR}/Nektar++Config.cmake @ONLY)
INSTALL(FILES ${CMAKE_BINARY_DIR}/Nektar++Config.cmake DESTINATION ${CMAKE_INSTALL_PREFIX})
INSTALL(FILES ${CMAKE_BINARY_DIR}/Nektar++Config.cmake
${CMAKE_SOURCE_DIR}/FindBoost.cmake
${CMAKE_SOURCE_DIR}/FindLoki.cmake
${CMAKE_SOURCE_DIR}/NektarCommon.cmake
DESTINATION ${CMAKE_INSTALL_PREFIX})
INSTALL(EXPORT Nektar++Libraries DESTINATION lib)
CMAKE_EXPORT_BUILD_SETTINGS("Nektar++BuildSettings.cmake")
library/Nektar++Config.cmake.in
+ 16
− 0
View file @ 072d4d58
SET(NEKTAR_USE_MEMORY_POOLS "@NEKTAR_USE_MEMORY_POOLS@")
SET(Boost_USE_STATIC_LIBS "@Boost_USE_STATIC_LIBS@")
SET(Boost_USE_MULTITHREAD "@Boost_USE_MULTITHREAD@")
SET(BOOST_ROOT "@BOOST_ROOT@")
SET(Boost_ADDITIONAL_VERSIONS "@Boost_ADDITIONAL_VERSIONS@")
FIND_PACKAGE( Boost 1.35.0 REQUIRED COMPONENTS thread )
INCLUDE(${NEKTAR++_ROOT_DIR}/FindLoki.cmake)
INCLUDE(${NEKTAR++_ROOT_DIR}/NektarCommon.cmake)
INCLUDE(${NEKTAR++_ROOT_DIR}/lib/Nektar++Libraries.cmake)
INCLUDE(${NEKTAR++_ROOT_DIR}/lib/Nektar++Libraries-debug.cmake)
INCLUDE(${NEKTAR++_ROOT_DIR}/lib/Nektar++Libraries-release.cmake)
INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIR} ${LOKI_INCLUDE_DIR})
#INCLUDE(${NEKTAR++_ROOT_DIR}/FindBoost.cmake)
#INCLUDE(${NEKTAR++_ROOT_DIR}/FindLoki.cmake)
\ No newline at end of file
library/NektarCommon.cmake 0 → 100644
+ 30
− 0
View file @ 072d4d58
MACRO(SET_LAPACK_LINK_LIBRARIES name)
IF( NEKTAR_USE_BLAS_LAPACK )
IF( NEKTAR_USE_MKL AND MKL_FOUND )
TARGET_LINK_LIBRARIES(${name} ${MKL_LAPACK} optimized ${MKL} debug ${MKL} ${MKL_GUIDE})
ENDIF( NEKTAR_USE_MKL AND MKL_FOUND )
IF( NEKTAR_USE_ACML AND ACML_FOUND )
TARGET_LINK_LIBRARIES(${name} ${ACML_TARGET_LINK_LIBRARIES} )
ENDIF( NEKTAR_USE_ACML AND ACML_FOUND )
IF( NEKTAR_USE_FRAMEWORK )
TARGET_LINK_LIBRARIES(${name} ${FRAMEWORK_LINK_FLAGS})
ENDIF ( NEKTAR_USE_FRAMEWORK )
IF( NEKTAR_USE_WIN32_LAPACK )
TARGET_LINK_LIBRARIES(${name} ${WIN32_LAPACK} ${WIN32_BLAS})
ENDIF( NEKTAR_USE_WIN32_LAPACK )
IF( USE_ATLAS AND ATLAS_FOUND )
TARGET_LINK_LIBRARIES(${name}
${ATLAS_LAPACK}
${ATLAS_CBLAS}
${ATLAS} )
ENDIF( USE_ATLAS AND ATLAS_FOUND )
IF( NEKTAR_USE_METIS )
TARGET_LINK_LIBRARIES(${name} optimized ${METIS_LIB} debug ${METIS_LIB} )
ENDIF( NEKTAR_USE_METIS )
ENDIF( NEKTAR_USE_BLAS_LAPACK )
ENDMACRO(SET_LAPACK_LINK_LIBRARIES name)
\ No newline at end of file
templates/executable/CMakeLists.txt 0 → 100644
+ 44
− 0
View file @ 072d4d58
######################################################
# This CMakeLists.txt is used to generate an executable
# that uses Nektar++. Customization points for your
# projects are marked below.
######################################################
CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
# TODO - Put the name of your project here.
SET(ProjectName Sample)
PROJECT(${ProjectName})
# Setup where CMake will look for modules. You probably
# won't need to modify this.
SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR} ${CMAKE_MODULE_PATH})
# Finds Nektar++. This may introduce other dependencies, such
# as Boost and Loki.
FIND_PACKAGE(Nektar++ REQUIRED)
# TODO - Add an entry here for every source file in your project.
SET(SourceFileNames
main.cpp
)
# TODO - Add an entry here for every header file in your project.
SET(HeaderFileNames
)
INCLUDE_DIRECTORIES(${NEKTAR++_INCLUDE_DIRS})
LINK_DIRECTORIES(${NEKTAR++_LIBRARY_DIRS})
ADD_DEFINITIONS(${NEKTAR++_DEFINITIONS})
ADD_EXECUTABLE(${ProjectName} ${SourceFileNames} ${HeaderFileNames})
# 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
templates/executable/FindNektar++.cmake 0 → 100755
+ 37
− 0
View file @ 072d4d58
# Find an installed Nektar++. Will not find a Nektar++ development environment.
SET(NEKTAR_SEARCH_PATH
${CMAKE_SOURCE_DIR}/../../Nektar++/dist
${CMAKE_BINARY_DIR}/../Nektar++/dist/
/usr/include
/usr/local/include
)
FIND_PATH(NEKTAR++_ROOT_DIR Nektar++Config.cmake ${NEKTAR_SEARCH_PATH} )
IF (NEKTAR++_ROOT_DIR)
SET(NEKTAR++_FOUND TRUE)
ELSE (NEKTAR++_ROOT_DIR)
SET(NEKTAR++_FOUND FALSE)
ENDIF (NEKTAR++_ROOT_DIR)
IF( NEKTAR++_FOUND )
INCLUDE(${NEKTAR++_ROOT_DIR}/Nektar++Config.cmake)
SET(NEKTAR++_INCLUDE_DIRS ${NEKTAR++_ROOT_DIR}/include)
SET(NEKTAR++_LIBRARY_DIRS ${NEKTAR++_ROOT_DIR}/lib)
SET(NEKTAR++_LIBRARIES LibUtilities LocalRegions MultiRegions SpatialDomains StdRegions)
# TODO - This is a little awkward because Nektar++ already knows what
# preprocessor definitions are defined, but I can't find a way to
# access them. This is a maintenance issue.
IF( NEKTAR_USE_MEMORY_POOLS )
ADD_DEFINITIONS(-DNEKTAR_MEMORY_POOL_ENABLED)
ELSE( NEKTAR_USE_MEMORY_POOLS )
REMOVE_DEFINITIONS(-DNEKTAR_MEMORY_POOL_ENABLED)
ENDIF( NEKTAR_USE_MEMORY_POOLS )
ELSE( NEKTAR++_FOUND )
SET(NEKTAR++_DEFINITIONS "")
SET(NEKTAR++_INCLUDE_DIRS "")
ENDIF( NEKTAR++_FOUND )
templates/executable/main.cpp 0 → 100644
+ 9
− 0
View file @ 072d4d58
#include <LibUtilities/LinearAlgebra/NekMatrix.hpp>
int main()
{
ASSERTL0(false, "False Test");
return 0;
}
\ No newline at end of file
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