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
Chameleon
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
AGULLO Emmanuel
Chameleon
Commits
3db67ddf
Commit
3db67ddf
authored
Feb 02, 2015
by
PRUVOST Florent
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix problem of empty LIBRARY_DIRS for modules which have a function test
parent
bdef190a
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
88 additions
and
19 deletions
+88
-19
cmake_modules/morse/find/FindCBLAS.cmake
cmake_modules/morse/find/FindCBLAS.cmake
+6
-1
cmake_modules/morse/find/FindCHAMELEON.cmake
cmake_modules/morse/find/FindCHAMELEON.cmake
+31
-11
cmake_modules/morse/find/FindFXT.cmake
cmake_modules/morse/find/FindFXT.cmake
+3
-1
cmake_modules/morse/find/FindHWLOC.cmake
cmake_modules/morse/find/FindHWLOC.cmake
+3
-1
cmake_modules/morse/find/FindLAPACKE.cmake
cmake_modules/morse/find/FindLAPACKE.cmake
+6
-1
cmake_modules/morse/find/FindMAGMA.cmake
cmake_modules/morse/find/FindMAGMA.cmake
+12
-1
cmake_modules/morse/find/FindQUARK.cmake
cmake_modules/morse/find/FindQUARK.cmake
+6
-2
cmake_modules/morse/find/FindSTARPU.cmake
cmake_modules/morse/find/FindSTARPU.cmake
+15
-0
cmake_modules/morse/find/FindTMG.cmake
cmake_modules/morse/find/FindTMG.cmake
+6
-1
No files found.
cmake_modules/morse/find/FindCBLAS.cmake
View file @
3db67ddf
...
...
@@ -241,7 +241,12 @@ if (BLAS_FOUND)
# check a function to validate the find
set
(
CMAKE_REQUIRED_INCLUDES
"
${
CBLAS_INCLUDE_DIRS
}
;
${
BLAS_INCLUDE_DIRS
}
"
)
set
(
CMAKE_REQUIRED_LIBRARIES
"
${
CBLAS_LIBRARIES
}
;
${
BLAS_LIBRARIES
}
"
)
set
(
CMAKE_REQUIRED_FLAGS
"-L
${
CBLAS_LIBRARY_DIRS
}
-L
${
BLAS_LIBRARY_DIRS
}
"
)
if
(
CBLAS_LIBRARY_DIRS
)
set
(
CMAKE_REQUIRED_FLAGS
"-L
${
CBLAS_LIBRARY_DIRS
}
"
)
if
(
BLAS_LIBRARY_DIRS
)
set
(
CMAKE_REQUIRED_FLAGS
"
${
CMAKE_REQUIRED_FLAGS
}
-L
${
BLAS_LIBRARY_DIRS
}
"
)
endif
()
endif
()
unset
(
CBLAS_WORKS CACHE
)
include
(
CheckFunctionExists
)
...
...
cmake_modules/morse/find/FindCHAMELEON.cmake
View file @
3db67ddf
...
...
@@ -446,56 +446,76 @@ if(NOT CHAMELEON_FOUND OR NOT CHAMELEON_LIBRARIES)
set
(
CMAKE_REQUIRED_INCLUDES
"
${
CHAMELEON_INCLUDE_DIRS
}
"
)
set
(
CMAKE_REQUIRED_FLAGS
)
foreach
(
libdir
${
CHAMELEON_LIBRARY_DIRS
}
)
#list(APPEND CMAKE_REQUIRED_FLAGS "-L${libdir}")
if
(
libdir
)
list
(
APPEND CMAKE_REQUIRED_FLAGS
"-L
${
libdir
}
"
)
endif
()
endforeach
()
set
(
CMAKE_REQUIRED_LIBRARIES
"
${
CHAMELEON_LIBRARIES
}
"
)
if
(
STARPU_FOUND
)
list
(
APPEND CMAKE_REQUIRED_INCLUDES
"
${
STARPU_INCLUDE_DIRS
}
"
)
#list(APPEND CMAKE_REQUIRED_FLAGS "-L${STARPU_LIBRARY_DIRS}")
if
(
STARPU_LIBRARY_DIRS
)
list
(
APPEND CMAKE_REQUIRED_FLAGS
"-L
${
STARPU_LIBRARY_DIRS
}
"
)
endif
()
list
(
APPEND CMAKE_REQUIRED_LIBRARIES
"
${
STARPU_LIBRARIES
}
"
)
endif
()
if
(
QUARK_FOUND
)
list
(
APPEND CMAKE_REQUIRED_INCLUDES
"$QUARK_INCLUDE_DIRS}"
)
#list(APPEND CMAKE_REQUIRED_FLAGS "-L${QUARK_LIBRARY_DIRS}")
if
(
QUARK_LIBRARY_DIRS
)
list
(
APPEND CMAKE_REQUIRED_FLAGS
"-L
${
QUARK_LIBRARY_DIRS
}
"
)
endif
()
list
(
APPEND CMAKE_REQUIRED_LIBRARIES
"
${
QUARK_LIBRARIES
}
"
)
endif
()
if
(
CUDA_FOUND
)
list
(
APPEND CMAKE_REQUIRED_INCLUDES
"
${
CUDA_INCLUDE_DIRS
}
"
)
#list(APPEND CMAKE_REQUIRED_FLAGS "-L${CUDA_LIBRARY_DIRS}")
if
(
QUARK_LIBRARY_DIRS
)
list
(
APPEND CMAKE_REQUIRED_FLAGS
"-L
${
CUDA_LIBRARY_DIRS
}
"
)
endif
()
list
(
APPEND CMAKE_REQUIRED_LIBRARIES
"
${
CUDA_CUBLAS_LIBRARIES
}
;
${
CUDA_LIBRARIES
}
"
)
endif
()
if
(
MAGMA_FOUND
)
list
(
APPEND CMAKE_REQUIRED_INCLUDES
"
${
MAGMA_INCLUDE_DIRS
}
"
)
#list(APPEND CMAKE_REQUIRED_FLAGS "-L${MAGMA_LIBRARY_DIRS}")
if
(
QUARK_LIBRARY_DIRS
)
list
(
APPEND CMAKE_REQUIRED_FLAGS
"-L
${
MAGMA_LIBRARY_DIRS
}
"
)
endif
()
list
(
APPEND CMAKE_REQUIRED_LIBRARIES
"
${${
MAGMA_LIBRARIES
}}
"
)
endif
()
if
(
MPI_FOUND
)
list
(
APPEND CMAKE_REQUIRED_INCLUDES
"
${
MPI_C_INCLUDE_PATH
}
"
)
#list(APPEND CMAKE_REQUIRED_FLAGS "-L${MPI_C_LINK_FLAGS}")
if
(
QUARK_LIBRARY_DIRS
)
list
(
APPEND CMAKE_REQUIRED_FLAGS
"-L
${
MPI_C_LINK_FLAGS
}
"
)
endif
()
list
(
APPEND CMAKE_REQUIRED_LIBRARIES
"
${
MPI_C_LIBRARIES
}
"
)
endif
()
if
(
HWLOC_FOUND
)
list
(
APPEND CMAKE_REQUIRED_INCLUDES
"
${
HWLOC_INCLUDE_DIRS
}
"
)
#list(APPEND CMAKE_REQUIRED_FLAGS "-L${HWLOC_LIBRARY_DIRS}")
if
(
QUARK_LIBRARY_DIRS
)
list
(
APPEND CMAKE_REQUIRED_FLAGS
"-L
${
HWLOC_LIBRARY_DIRS
}
"
)
endif
()
list
(
APPEND CMAKE_REQUIRED_LIBRARIES
"
${
HWLOC_LIBRARIES
}
"
)
endif
()
if
(
TMG_FOUND
)
list
(
APPEND CMAKE_REQUIRED_INCLUDES
"
${
TMG_INCLUDE_DIRS
}
"
)
#list(APPEND CMAKE_REQUIRED_FLAGS "-L${TMG_LIBRARY_DIRS}")
if
(
QUARK_LIBRARY_DIRS
)
list
(
APPEND CMAKE_REQUIRED_FLAGS
"-L
${
TMG_LIBRARY_DIRS
}
"
)
endif
()
list
(
APPEND CMAKE_REQUIRED_LIBRARIES
"
${
TMG_LIBRARIES
}
"
)
endif
()
if
(
LAPACKE_FOUND
)
list
(
APPEND CMAKE_REQUIRED_INCLUDES
"
${
LAPACKE_INCLUDE_DIRS
}
"
)
#list(APPEND CMAKE_REQUIRED_FLAGS "-L${LAPACKE_LIBRARY_DIRS}")
if
(
QUARK_LIBRARY_DIRS
)
list
(
APPEND CMAKE_REQUIRED_FLAGS
"-L
${
LAPACKE_LIBRARY_DIRS
}
"
)
endif
()
list
(
APPEND CMAKE_REQUIRED_LIBRARIES
"
${
LAPACKE_LIBRARIES
}
"
)
endif
()
if
(
CBLAS_FOUND
)
list
(
APPEND CMAKE_REQUIRED_INCLUDES
"
${
CBLAS_INCLUDE_DIRS
}
"
)
#list(APPEND CMAKE_REQUIRED_FLAGS "-L${CBLAS_LIBRARY_DIRS}")
if
(
QUARK_LIBRARY_DIRS
)
list
(
APPEND CMAKE_REQUIRED_FLAGS
"-L
${
CBLAS_LIBRARY_DIRS
}
"
)
endif
()
list
(
APPEND CMAKE_REQUIRED_LIBRARIES
"
${
CBLAS_LIBRARIES
}
"
)
endif
()
list
(
APPEND CMAKE_REQUIRED_LIBRARIES
${
CHAMELEON_EXTRA_LIBRARIES
}
)
#
string(REPLACE ";" " " CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}")
string
(
REPLACE
";"
" "
CMAKE_REQUIRED_FLAGS
"
${
CMAKE_REQUIRED_FLAGS
}
"
)
unset
(
CHAMELEON_WORKS CACHE
)
include
(
CheckFunctionExists
)
...
...
cmake_modules/morse/find/FindFXT.cmake
View file @
3db67ddf
...
...
@@ -204,7 +204,9 @@ if(NOT FXT_FOUND OR NOT FXT_LIBRARIES)
# check a function to validate the find
set
(
CMAKE_REQUIRED_INCLUDES
"
${
FXT_INCLUDE_DIRS
}
"
)
set
(
CMAKE_REQUIRED_LIBRARIES
"
${
FXT_LIBRARIES
}
"
)
set
(
CMAKE_REQUIRED_FLAGS
"-L
${
FXT_LIBRARY_DIRS
}
"
)
if
(
FXT_LIBRARY_DIRS
)
set
(
CMAKE_REQUIRED_FLAGS
"-L
${
FXT_LIBRARY_DIRS
}
"
)
endif
()
unset
(
FXT_WORKS CACHE
)
include
(
CheckFunctionExists
)
...
...
cmake_modules/morse/find/FindHWLOC.cmake
View file @
3db67ddf
...
...
@@ -211,7 +211,9 @@ if(NOT HWLOC_FOUND OR NOT HWLOC_LIBRARIES)
# check a function to validate the find
set
(
CMAKE_REQUIRED_INCLUDES
"
${
HWLOC_INCLUDE_DIRS
}
"
)
set
(
CMAKE_REQUIRED_LIBRARIES
"
${
HWLOC_LIBRARIES
}
"
)
set
(
CMAKE_REQUIRED_FLAGS
"-L
${
HWLOC_LIBRARY_DIRS
}
"
)
if
(
HWLOC_LIBRARY_DIRS
)
set
(
CMAKE_REQUIRED_FLAGS
"-L
${
HWLOC_LIBRARY_DIRS
}
"
)
endif
()
unset
(
HWLOC_WORKS CACHE
)
include
(
CheckFunctionExists
)
...
...
cmake_modules/morse/find/FindLAPACKE.cmake
View file @
3db67ddf
...
...
@@ -241,7 +241,12 @@ if (LAPACK_FOUND)
elseif
(
CMAKE_Fortran_COMPILER MATCHES
".+ifort.*"
)
list
(
APPEND CMAKE_REQUIRED_LIBRARIES
"-lifcore"
)
endif
()
set
(
CMAKE_REQUIRED_FLAGS
"-L
${
LAPACKE_LIBRARY_DIRS
}
-L
${
LAPACK_LIBRARY_DIRS
}
"
)
if
(
LAPACKE_LIBRARY_DIRS
)
set
(
CMAKE_REQUIRED_FLAGS
"-L
${
LAPACKE_LIBRARY_DIRS
}
"
)
if
(
LAPACK_LIBRARY_DIRS
)
set
(
CMAKE_REQUIRED_FLAGS
"
${
CMAKE_REQUIRED_FLAGS
}
-L
${
LAPACK_LIBRARY_DIRS
}
"
)
endif
()
endif
()
unset
(
LAPACKE_WORKS CACHE
)
include
(
CheckFunctionExists
)
...
...
cmake_modules/morse/find/FindMAGMA.cmake
View file @
3db67ddf
...
...
@@ -278,7 +278,18 @@ if(NOT MAGMA_FOUND OR NOT MAGMA_LIBRARIES)
# check a function to validate the find
set
(
CMAKE_REQUIRED_INCLUDES
"
${
MAGMA_INCLUDE_DIRS
}
;
${
CBLAS_INCLUDE_DIRS
}
;
${
CUDA_INCLUDE_DIRS
}
"
)
set
(
CMAKE_REQUIRED_LIBRARIES
"
${
MAGMA_LIBRARIES
}
;
${
CBLAS_LIBRARIES
}
;
${
CUDA_CUBLAS_LIBRARIES
}
;
${
CUDA_LIBRARIES
}
;
${
LAPACK_LIBRARIES
}
"
)
set
(
CMAKE_REQUIRED_FLAGS
"-L
${
MAGMA_LIBRARY_DIRS
}
-L
${
CBLAS_LIBRARY_DIRS
}
-L
${
CUDA_LIBRARY_DIRS
}
-L
${
LAPACK_LIBRARY_DIRS
}
"
)
if
(
MAGMA_LIBRARY_DIRS
)
set
(
CMAKE_REQUIRED_FLAGS
"-L
${
MAGMA_LIBRARY_DIRS
}
"
)
if
(
CBLAS_LIBRARY_DIRS
)
set
(
CMAKE_REQUIRED_FLAGS
"
${
CMAKE_REQUIRED_FLAGS
}
-L
${
CBLAS_LIBRARY_DIRS
}
"
)
if
(
CUDA_LIBRARY_DIRS
)
set
(
CMAKE_REQUIRED_FLAGS
"
${
CMAKE_REQUIRED_FLAGS
}
-L
${
CUDA_LIBRARY_DIRS
}
"
)
if
(
LAPACK_LIBRARY_DIRS
)
set
(
CMAKE_REQUIRED_FLAGS
"
${
CMAKE_REQUIRED_FLAGS
}
-L
${
LAPACK_LIBRARY_DIRS
}
"
)
endif
()
endif
()
endif
()
endif
()
unset
(
MAGMA_WORKS CACHE
)
include
(
CheckFunctionExists
)
...
...
cmake_modules/morse/find/FindQUARK.cmake
View file @
3db67ddf
...
...
@@ -191,11 +191,15 @@ if(QUARK_LIBRARIES)
# check a function to validate the find
set
(
CMAKE_REQUIRED_INCLUDES
"
${
QUARK_INCLUDE_DIRS
}
"
)
set
(
CMAKE_REQUIRED_LIBRARIES
"
${
QUARK_LIBRARIES
}
;
${
CMAKE_THREAD_LIBS_INIT
}
"
)
set
(
CMAKE_REQUIRED_FLAGS
"-L
${
QUARK_LIBRARY_DIRS
}
"
)
if
(
QUARK_LIBRARY_DIRS
)
set
(
CMAKE_REQUIRED_FLAGS
"-L
${
QUARK_LIBRARY_DIRS
}
"
)
endif
()
if
(
HWLOC_FOUND
)
list
(
APPEND CMAKE_REQUIRED_INCLUDES
"
${
HWLOC_INCLUDE_DIRS
}
"
)
list
(
APPEND CMAKE_REQUIRED_LIBRARIES
"
${
HWLOC_LIBRARIES
}
"
)
list
(
APPEND CMAKE_REQUIRED_FLAGS
"-L
${
HWLOC_LIBRARIES
}
"
)
if
(
HWLOC_LIBRARY_DIRS
)
set
(
CMAKE_REQUIRED_FLAGS
"
${
CMAKE_REQUIRED_FLAGS
}
-L
${
HWLOC_LIBRARY_DIRS
}
"
)
endif
()
endif
()
unset
(
QUARK_WORKS CACHE
)
...
...
cmake_modules/morse/find/FindSTARPU.cmake
View file @
3db67ddf
...
...
@@ -532,22 +532,37 @@ if( (NOT STARPU_SHM_FOUND) OR (NOT STARPU_SHM_LIBRARIES) OR
set
(
CMAKE_REQUIRED_INCLUDES
"
${
STARPU_INCLUDE_DIRS
}
"
)
set
(
CMAKE_REQUIRED_FLAGS
)
foreach
(
libdir
${
STARPU_LIBRARY_DIRS
}
)
if
(
libdir
)
set
(
CMAKE_REQUIRED_FLAGS
"
${
CMAKE_REQUIRED_FLAGS
}
-L
${
libdir
}
"
)
endif
()
endforeach
()
set
(
CMAKE_REQUIRED_LIBRARIES
"
${
STARPU_LIBRARIES
}
"
)
if
(
HWLOC_FOUND
)
list
(
APPEND CMAKE_REQUIRED_INCLUDES
"
${
HWLOC_INCLUDE_DIRS
}
"
)
if
(
HWLOC_LIBRARY_DIRS
)
set
(
CMAKE_REQUIRED_FLAGS
"
${
CMAKE_REQUIRED_FLAGS
}
-L
${
HWLOC_LIBRARY_DIRS
}
"
)
endif
()
list
(
APPEND CMAKE_REQUIRED_LIBRARIES
"
${
HWLOC_LIBRARIES
}
"
)
endif
()
if
(
MPI_FOUND
)
list
(
APPEND CMAKE_REQUIRED_INCLUDES
"
${
MPI_C_INCLUDE_PATH
}
"
)
if
(
MPI_C_LINK_FLAGS
)
set
(
CMAKE_REQUIRED_FLAGS
"
${
CMAKE_REQUIRED_FLAGS
}
-L
${
MPI_C_LINK_FLAGS
}
"
)
endif
()
list
(
APPEND CMAKE_REQUIRED_LIBRARIES
"
${
MPI_C_LIBRARIES
}
"
)
endif
()
if
(
CUDA_FOUND
)
list
(
APPEND CMAKE_REQUIRED_INCLUDES
"
${
CUDA_INCLUDE_DIRS
}
"
)
if
(
CUDA_LIBRARY_DIRS
)
set
(
CMAKE_REQUIRED_FLAGS
"
${
CMAKE_REQUIRED_FLAGS
}
-L
${
CUDA_LIBRARY_DIRS
}
"
)
endif
()
list
(
APPEND CMAKE_REQUIRED_LIBRARIES
"
${
CUDA_CUBLAS_LIBRARIES
}
;
${
CUDA_LIBRARIES
}
"
)
endif
()
if
(
MAGMA_FOUND
)
list
(
APPEND CMAKE_REQUIRED_INCLUDES
"
${
MAGMA_INCLUDE_DIRS
}
"
)
if
(
MAGMA_LIBRARY_DIRS
)
set
(
CMAKE_REQUIRED_FLAGS
"
${
CMAKE_REQUIRED_FLAGS
}
-L
${
MAGMA_LIBRARY_DIRS
}
"
)
endif
()
list
(
APPEND CMAKE_REQUIRED_LIBRARIES
"
${${
MAGMA_LIBRARIES
}}
"
)
endif
()
...
...
cmake_modules/morse/find/FindTMG.cmake
View file @
3db67ddf
...
...
@@ -191,7 +191,12 @@ if (LAPACK_FOUND)
# check a function to validate the find
set
(
CMAKE_REQUIRED_INCLUDES
"
${
TMG_INCLUDE_DIRS
}
;
${
LAPACK_INCLUDE_DIRS
}
"
)
set
(
CMAKE_REQUIRED_LIBRARIES
"
${
TMG_LIBRARIES
}
;
${
LAPACK_LIBRARIES
}
"
)
set
(
CMAKE_REQUIRED_FLAGS
"-L
${
TMG_LIBRARY_DIRS
}
-L
${
LAPACK_LIBRARY_DIRS
}
"
)
if
(
TMG_LIBRARY_DIRS
)
set
(
CMAKE_REQUIRED_FLAGS
"-L
${
TMG_LIBRARY_DIRS
}
"
)
if
(
LAPACK_LIBRARY_DIRS
)
set
(
CMAKE_REQUIRED_FLAGS
"
${
CMAKE_REQUIRED_FLAGS
}
-L
${
LAPACK_LIBRARY_DIRS
}
"
)
endif
()
endif
()
if
(
TMG_LIBRARIES
)
unset
(
TMG_WORKS CACHE
)
...
...
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