Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Nektar
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
0
Merge Requests
0
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
MMFSolver
Nektar
Commits
64d9f7d8
Commit
64d9f7d8
authored
Oct 07, 2012
by
Chris Cantwell
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Switched to gsmpi-1.1
Added XXT support from gsmpi-1.1
parent
8fd0607f
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
39 additions
and
10 deletions
+39
-10
CMakeLists.txt
CMakeLists.txt
+1
-0
cmake/FindGSMPI.cmake
cmake/FindGSMPI.cmake
+4
-5
cmake/FindXXT.cmake
cmake/FindXXT.cmake
+26
-0
cmake/NektarCommon.cmake
cmake/NektarCommon.cmake
+1
-1
cmake/ThirdPartyMPI.cmake
cmake/ThirdPartyMPI.cmake
+7
-4
No files found.
CMakeLists.txt
View file @
64d9f7d8
...
...
@@ -275,6 +275,7 @@ INSTALL(FILES ${CMAKE_BINARY_DIR}/Nektar++Config.cmake
${
CMAKE_SOURCE_DIR
}
/cmake/NektarCommon.cmake
${
CMAKE_SOURCE_DIR
}
/cmake/FindTinyXml.cmake
${
CMAKE_SOURCE_DIR
}
/cmake/FindGSMPI.cmake
${
CMAKE_SOURCE_DIR
}
/cmake/FindXXT.cmake
DESTINATION
${
CMAKE_INSTALL_PREFIX
}
)
INSTALL
(
EXPORT Nektar++Libraries DESTINATION
${
LIB_DIR
}
)
...
...
cmake/FindGSMPI.cmake
View file @
64d9f7d8
SET
(
GSMPI_SEARCH_PATHS
${
CMAKE_SOURCE_DIR
}
/ThirdParty/gsmpi-1.
0
/
${
CMAKE_SOURCE_DIR
}
/ThirdParty/gsmpi-1.
0
/build/
${
CMAKE_SOURCE_DIR
}
/../ThirdParty/gsmpi-1.
0
/
${
CMAKE_SOURCE_DIR
}
/../ThirdParty/gsmpi-1.
0
/build
${
CMAKE_SOURCE_DIR
}
/ThirdParty/gsmpi-1.
1
/
${
CMAKE_SOURCE_DIR
}
/ThirdParty/gsmpi-1.
1
/build/
${
CMAKE_SOURCE_DIR
}
/../ThirdParty/gsmpi-1.
1
/
${
CMAKE_SOURCE_DIR
}
/../ThirdParty/gsmpi-1.
1
/build
${
CMAKE_SOURCE_DIR
}
/ThirdParty/dist/lib
${
CMAKE_SOURCE_DIR
}
/../ThirdParty/dist/lib
)
FIND_LIBRARY
(
GSMPI_LIBRARY NAMES gsmpi PATHS
${
GSMPI_SEARCH_PATHS
}
)
SET
(
GSMPI_FOUND FALSE
)
IF
(
GSMPI_LIBRARY
)
SET
(
GSMPI_FOUND TRUE
)
...
...
cmake/FindXXT.cmake
0 → 100644
View file @
64d9f7d8
SET
(
XXT_SEARCH_PATHS
${
CMAKE_SOURCE_DIR
}
/ThirdParty/gsmpi-1.1/
${
CMAKE_SOURCE_DIR
}
/ThirdParty/gsmpi-1.1/build/
${
CMAKE_SOURCE_DIR
}
/../ThirdParty/gsmpi-1.1/
${
CMAKE_SOURCE_DIR
}
/../ThirdParty/gsmpi-1.1/build
${
CMAKE_SOURCE_DIR
}
/ThirdParty/dist/lib
${
CMAKE_SOURCE_DIR
}
/../ThirdParty/dist/lib
)
FIND_LIBRARY
(
XXT_LIBRARY NAMES xxt PATHS
${
XXT_SEARCH_PATHS
}
)
SET
(
XXT_FOUND FALSE
)
IF
(
XXT_LIBRARY
)
SET
(
XXT_FOUND TRUE
)
MARK_AS_ADVANCED
(
XXT_LIBRARY
)
ENDIF
(
XXT_LIBRARY
)
IF
(
XXT_FOUND
)
IF
(
NOT XXT_FIND_QUIETLY
)
MESSAGE
(
STATUS
"Found XXT"
)
ENDIF
(
NOT XXT_FIND_QUIETLY
)
ELSE
(
XXT_FOUND
)
IF
(
XXT_FIND_REQUIRED
)
MESSAGE
(
FATAL_ERROR
"Could not find XXT"
)
ENDIF
(
XXT_FIND_REQUIRED
)
ENDIF
(
XXT_FOUND
)
cmake/NektarCommon.cmake
View file @
64d9f7d8
...
...
@@ -213,7 +213,7 @@ MACRO(ADD_NEKTAR_LIBRARY name component type)
ADD_DEPENDENCIES
(
${
name
}
spblastk0.9b modmetis-4.0 boost tinyxml zlib
)
IF
(
NEKTAR_USE_MPI
)
TARGET_LINK_LIBRARIES
(
${
name
}
${
GSMPI_LIBRARY
}
)
TARGET_LINK_LIBRARIES
(
${
name
}
${
GSMPI_LIBRARY
}
${
XXT_LIBRARY
}
)
ENDIF
(
NEKTAR_USE_MPI
)
SET_COMMON_PROPERTIES
(
${
name
}
)
...
...
cmake/ThirdPartyMPI.cmake
View file @
64d9f7d8
...
...
@@ -13,20 +13,23 @@ IF( NEKTAR_USE_MPI )
IF
(
THIRDPARTY_BUILD_GSMPI
)
EXTERNALPROJECT_ADD
(
gsmpi-1.
0
gsmpi-1.
1
PREFIX
${
TPSRC
}
URL
${
TPURL
}
/gsmpi-1.
0
.tar.bz2
URL_MD5
"
a8ea5c3f9fac4695690ed344b380336f
"
URL
${
TPURL
}
/gsmpi-1.
1
.tar.bz2
URL_MD5
"
238e6df3ca1185756a38867f5c0bbd74
"
DOWNLOAD_DIR
${
TPSRC
}
CONFIGURE_COMMAND
${
CMAKE_COMMAND
}
-DCMAKE_INSTALL_PREFIX:PATH=
${
TPSRC
}
/dist
${
TPSRC
}
/src/gsmpi-1.
0
${
TPSRC
}
/src/gsmpi-1.
1
)
SET
(
GSMPI_LIBRARY gsmpi CACHE FILEPATH
"GSMPI path"
FORCE
)
SET
(
XXT_LIBRARY xxt CACHE FILEPATH
"XXT path"
FORCE
)
ELSE
(
THIRDPARTY_BUILD_GSMPI
)
INCLUDE
(
FindGSMPI
)
INCLUDE
(
FindXXT
)
ENDIF
(
THIRDPARTY_BUILD_GSMPI
)
ENDIF
(
NEKTAR_USE_MPI
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment