Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
ScalFMM
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
5
Issues
5
List
Boards
Labels
Service Desk
Milestones
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
solverstack
ScalFMM
Commits
e2ae6bcd
Commit
e2ae6bcd
authored
Feb 20, 2015
by
Florent Pruvost
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
consider MPI_C_LINK_FLAGS as CMAKE_REQUIRED_FLAGS during linking tests
parent
f5d468cc
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
32 additions
and
8 deletions
+32
-8
CMakeModules/morse/find/FindCHAMELEON.cmake
CMakeModules/morse/find/FindCHAMELEON.cmake
+8
-2
CMakeModules/morse/find/FindPASTIX.cmake
CMakeModules/morse/find/FindPASTIX.cmake
+8
-2
CMakeModules/morse/find/FindPTSCOTCH.cmake
CMakeModules/morse/find/FindPTSCOTCH.cmake
+8
-2
CMakeModules/morse/find/FindSTARPU.cmake
CMakeModules/morse/find/FindSTARPU.cmake
+8
-2
No files found.
CMakeModules/morse/find/FindCHAMELEON.cmake
View file @
e2ae6bcd
...
...
@@ -502,6 +502,7 @@ if( (NOT PKG_CONFIG_EXECUTABLE AND NOT CHAMELEON_FOUND) OR NOT CHAMELEON_FOUND )
set
(
REQUIRED_INCDIRS
)
set
(
REQUIRED_LIBDIRS
)
set
(
REQUIRED_LIBS
)
set
(
REQUIRED_FLAGS
)
# CHAMELEON
if
(
CHAMELEON_INCLUDE_DIRS
)
...
...
@@ -597,7 +598,7 @@ if( (NOT PKG_CONFIG_EXECUTABLE AND NOT CHAMELEON_FOUND) OR NOT CHAMELEON_FOUND )
list
(
APPEND REQUIRED_INCDIRS
"
${
MPI_C_INCLUDE_PATH
}
"
)
endif
()
if
(
MPI_C_LINK_FLAGS
)
list
(
APPEND REQUIRED_
LIB
S
"
${
MPI_C_LINK_FLAGS
}
"
)
list
(
APPEND REQUIRED_
FLAG
S
"
${
MPI_C_LINK_FLAGS
}
"
)
endif
()
list
(
APPEND REQUIRED_LIBS
"
${
MPI_C_LIBRARIES
}
"
)
endif
()
...
...
@@ -683,6 +684,7 @@ if( (NOT PKG_CONFIG_EXECUTABLE AND NOT CHAMELEON_FOUND) OR NOT CHAMELEON_FOUND )
list
(
APPEND CMAKE_REQUIRED_LIBRARIES
"-L
${
lib_dir
}
"
)
endforeach
()
list
(
APPEND CMAKE_REQUIRED_LIBRARIES
"
${
REQUIRED_LIBS
}
"
)
list
(
APPEND CMAKE_REQUIRED_FLAGS
"
${
REQUIRED_FLAGS
}
"
)
# test link
unset
(
CHAMELEON_WORKS CACHE
)
...
...
@@ -692,7 +694,11 @@ if( (NOT PKG_CONFIG_EXECUTABLE AND NOT CHAMELEON_FOUND) OR NOT CHAMELEON_FOUND )
if
(
CHAMELEON_WORKS
)
# save link with dependencies
set
(
CHAMELEON_LIBRARIES_DEP
"
${
REQUIRED_LIBS
}
"
)
if
(
REQUIRED_FLAGS
)
set
(
CHAMELEON_LIBRARIES_DEP
"
${
REQUIRED_FLAGS
}
;
${
REQUIRED_LIBS
}
"
)
else
()
set
(
CHAMELEON_LIBRARIES_DEP
"
${
REQUIRED_LIBS
}
"
)
endif
()
set
(
CHAMELEON_LIBRARY_DIRS_DEP
"
${
REQUIRED_LIBDIRS
}
"
)
set
(
CHAMELEON_INCLUDE_DIRS_DEP
"
${
REQUIRED_INCDIRS
}
"
)
else
()
...
...
CMakeModules/morse/find/FindPASTIX.cmake
View file @
e2ae6bcd
...
...
@@ -464,6 +464,7 @@ if(PASTIX_LIBRARIES)
set
(
REQUIRED_INCDIRS
)
set
(
REQUIRED_LIBDIRS
)
set
(
REQUIRED_LIBS
)
set
(
REQUIRED_FLAGS
)
# PASTIX
if
(
PASTIX_INCLUDE_DIRS
)
...
...
@@ -505,7 +506,7 @@ if(PASTIX_LIBRARIES)
list
(
APPEND REQUIRED_INCDIRS
"
${
MPI_C_INCLUDE_PATH
}
"
)
endif
()
if
(
MPI_C_LINK_FLAGS
)
list
(
APPEND REQUIRED_
LIB
S
"
${
MPI_C_LINK_FLAGS
}
"
)
list
(
APPEND REQUIRED_
FLAG
S
"
${
MPI_C_LINK_FLAGS
}
"
)
endif
()
list
(
APPEND REQUIRED_LIBS
"
${
MPI_C_LIBRARIES
}
"
)
endif
()
...
...
@@ -585,6 +586,7 @@ if(PASTIX_LIBRARIES)
list
(
APPEND CMAKE_REQUIRED_LIBRARIES
"-L
${
lib_dir
}
"
)
endforeach
()
list
(
APPEND CMAKE_REQUIRED_LIBRARIES
"
${
REQUIRED_LIBS
}
"
)
list
(
APPEND CMAKE_REQUIRED_FLAGS
"
${
REQUIRED_FLAGS
}
"
)
# test link
unset
(
PASTIX_WORKS CACHE
)
...
...
@@ -594,7 +596,11 @@ if(PASTIX_LIBRARIES)
if
(
PASTIX_WORKS
)
# save link with dependencies
set
(
PASTIX_LIBRARIES_DEP
"
${
REQUIRED_LIBS
}
"
)
if
(
REQUIRED_FLAGS
)
set
(
PASTIX_LIBRARIES_DEP
"
${
REQUIRED_FLAGS
}
;
${
REQUIRED_LIBS
}
"
)
else
()
set
(
PASTIX_LIBRARIES_DEP
"
${
REQUIRED_LIBS
}
"
)
endif
()
set
(
PASTIX_LIBRARY_DIRS_DEP
"
${
REQUIRED_LIBDIRS
}
"
)
set
(
PASTIX_INCLUDE_DIRS_DEP
"
${
REQUIRED_INCDIRS
}
"
)
else
()
...
...
CMakeModules/morse/find/FindPTSCOTCH.cmake
View file @
e2ae6bcd
...
...
@@ -215,6 +215,7 @@ if(PTSCOTCH_LIBRARIES)
set
(
REQUIRED_INCDIRS
)
set
(
REQUIRED_LIBDIRS
)
set
(
REQUIRED_LIBS
)
set
(
REQUIRED_FLAGS
)
# PTSCOTCH
if
(
PTSCOTCH_INCLUDE_DIRS
)
...
...
@@ -230,7 +231,7 @@ if(PTSCOTCH_LIBRARIES)
list
(
APPEND CMAKE_REQUIRED_INCLUDES
"
${
MPI_C_INCLUDE_PATH
}
"
)
endif
()
if
(
MPI_C_LINK_FLAGS
)
list
(
APPEND REQUIRED_
LIB
S
"
${
MPI_C_LINK_FLAGS
}
"
)
list
(
APPEND REQUIRED_
FLAG
S
"
${
MPI_C_LINK_FLAGS
}
"
)
endif
()
list
(
APPEND REQUIRED_LIBS
"
${
MPI_C_LIBRARIES
}
"
)
endif
()
...
...
@@ -246,6 +247,7 @@ if(PTSCOTCH_LIBRARIES)
list
(
APPEND CMAKE_REQUIRED_LIBRARIES
"-L
${
lib_dir
}
"
)
endforeach
()
list
(
APPEND CMAKE_REQUIRED_LIBRARIES
"
${
REQUIRED_LIBS
}
"
)
list
(
APPEND CMAKE_REQUIRED_FLAGS
"
${
REQUIRED_FLAGS
}
"
)
# test link
unset
(
PTSCOTCH_WORKS CACHE
)
...
...
@@ -255,7 +257,11 @@ if(PTSCOTCH_LIBRARIES)
if
(
PTSCOTCH_WORKS
)
# save link with dependencies
set
(
PTSCOTCH_LIBRARIES_DEP
"
${
REQUIRED_LIBS
}
"
)
if
(
REQUIRED_FLAGS
)
set
(
PTSCOTCH_LIBRARIES_DEP
"
${
REQUIRED_FLAGS
}
;
${
REQUIRED_LIBS
}
"
)
else
()
set
(
PTSCOTCH_LIBRARIES_DEP
"
${
REQUIRED_LIBS
}
"
)
endif
()
set
(
PTSCOTCH_LIBRARY_DIRS_DEP
"
${
REQUIRED_LIBDIRS
}
"
)
set
(
PTSCOTCH_INCLUDE_DIRS_DEP
"
${
REQUIRED_INCDIRS
}
"
)
else
()
...
...
CMakeModules/morse/find/FindSTARPU.cmake
View file @
e2ae6bcd
...
...
@@ -606,6 +606,7 @@ if( (NOT PKG_CONFIG_EXECUTABLE AND NOT STARPU_FOUND) OR
set
(
REQUIRED_INCDIRS
)
set
(
REQUIRED_LIBDIRS
)
set
(
REQUIRED_LIBS
)
set
(
REQUIRED_FLAGS
)
# STARPU
if
(
STARPU_INCLUDE_DIRS
)
...
...
@@ -640,7 +641,7 @@ if( (NOT PKG_CONFIG_EXECUTABLE AND NOT STARPU_FOUND) OR
list
(
APPEND REQUIRED_INCDIRS
"
${
MPI_C_INCLUDE_PATH
}
"
)
endif
()
if
(
MPI_C_LINK_FLAGS
)
list
(
APPEND REQUIRED_
LIB
S
"
${
MPI_C_LINK_FLAGS
}
"
)
list
(
APPEND REQUIRED_
FLAG
S
"
${
MPI_C_LINK_FLAGS
}
"
)
endif
()
list
(
APPEND REQUIRED_LIBS
"
${
MPI_C_LIBRARIES
}
"
)
endif
()
...
...
@@ -718,6 +719,7 @@ if( (NOT PKG_CONFIG_EXECUTABLE AND NOT STARPU_FOUND) OR
list
(
APPEND CMAKE_REQUIRED_LIBRARIES
"-L
${
lib_dir
}
"
)
endforeach
()
list
(
APPEND CMAKE_REQUIRED_LIBRARIES
"
${
REQUIRED_LIBS
}
"
)
list
(
APPEND CMAKE_REQUIRED_FLAGS
"
${
REQUIRED_FLAGS
}
"
)
# test link
unset
(
STARPU_WORKS CACHE
)
...
...
@@ -727,7 +729,11 @@ if( (NOT PKG_CONFIG_EXECUTABLE AND NOT STARPU_FOUND) OR
if
(
STARPU_WORKS
)
# save link with dependencies
set
(
STARPU_LIBRARIES_DEP
"
${
REQUIRED_LIBS
}
"
)
if
(
REQUIRED_FLAGS
)
set
(
STARPU_LIBRARIES_DEP
"
${
REQUIRED_FLAGS
}
;
${
REQUIRED_LIBS
}
"
)
else
()
set
(
STARPU_LIBRARIES_DEP
"
${
REQUIRED_LIBS
}
"
)
endif
()
set
(
STARPU_LIBRARY_DIRS_DEP
"
${
REQUIRED_LIBDIRS
}
"
)
set
(
STARPU_INCLUDE_DIRS_DEP
"
${
REQUIRED_INCDIRS
}
"
)
else
()
...
...
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