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
87
Issues
87
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
43
Merge Requests
43
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Test Cases
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Nektar
Nektar
Commits
cf251710
Commit
cf251710
authored
May 28, 2016
by
Chris Cantwell
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Attempt to fix for older versions of CMake still used in supported OSs.
parent
431f2dd9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
1 deletion
+5
-1
cmake/ThirdPartyMPI.cmake
cmake/ThirdPartyMPI.cmake
+2
-0
library/LibUtilities/CMakeLists.txt
library/LibUtilities/CMakeLists.txt
+0
-1
tests/CMakeLists.txt
tests/CMakeLists.txt
+3
-0
No files found.
cmake/ThirdPartyMPI.cmake
View file @
cf251710
...
...
@@ -47,6 +47,8 @@ IF( NEKTAR_USE_MPI )
UNSET
(
HAVE_APRUN CACHE
)
ENDIF
()
ADD_DEFINITIONS
(
-DNEKTAR_USE_MPI
)
IF
(
THIRDPARTY_BUILD_GSMPI
)
EXTERNALPROJECT_ADD
(
gsmpi-1.2
...
...
library/LibUtilities/CMakeLists.txt
View file @
cf251710
...
...
@@ -411,7 +411,6 @@ ENDIF()
# MPI
IF
(
NEKTAR_USE_MPI
)
TARGET_LINK_LIBRARIES
(
LibUtilities LINK_PRIVATE
${
GSMPI_LIBRARY
}
${
XXT_LIBRARY
}
)
TARGET_COMPILE_DEFINITIONS
(
LibUtilities PUBLIC
"-DNEKTAR_USE_MPI"
)
IF
(
NOT MPI_BUILTIN
)
TARGET_LINK_LIBRARIES
(
LibUtilities LINK_PUBLIC
${
MPI_LIBRARY
}
${
MPI_EXTRA_LIBRARY
}
)
SET_TARGET_PROPERTIES
(
LibUtilities
...
...
tests/CMakeLists.txt
View file @
cf251710
...
...
@@ -53,6 +53,9 @@ IF( ${CMAKE_SYSTEM} MATCHES "Darwin-*")
PROPERTIES LINK_FLAGS
"-Wl,-undefined,dynamic_lookup -Wl,-rpath,
${
CMAKE_INSTALL_PREFIX
}
/
${
LIB_DIR
}
-Wl,-rpath,
${
Boost_LIBRARY_DIRS
}
"
)
ENDIF
(
${
CMAKE_SYSTEM
}
MATCHES
"Darwin-*"
)
SET_TARGET_PROPERTIES
(
Tester
PROPERTIES COMPILE_FLAGS
"-UNEKTAR_USE_MPI"
)
INSTALL
(
TARGETS Tester
RUNTIME DESTINATION
${
NEKTAR_BIN_DIR
}
COMPONENT test OPTIONAL
ARCHIVE DESTINATION
${
NEKTAR_LIB_DIR
}
COMPONENT test OPTIONAL
...
...
Chris Cantwell
@ccantwel
mentioned in commit
67a69821
·
Jun 02, 2016
mentioned in commit
67a69821
mentioned in commit 67a698215bf2d9fcb4e4726ea65c09269c429fcb
Toggle commit list
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