Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
solverstack
ScalFMM
Commits
f484a848
Commit
f484a848
authored
Mar 27, 2015
by
BRAMAS Berenger
Browse files
Merge branch 'master' of
git+ssh://scm.gforge.inria.fr//gitroot//scalfmm/scalfmm
parents
a138b502
0da005f8
Changes
6
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
f484a848
...
...
@@ -314,6 +314,9 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_SOURCE_DIR}/CMakeModules/morse/")
unset
(
FFT_LIBRARIES CACHE
)
message
(
STATUS
" SCALFMM USE MKL already defined"
)
set
(
FFT_INCLUDES
"$ENV{MKLROOT}/include/fftw"
CACHE STRING
"Set your MKL flags"
)
if
(
BLAS_FOUND
)
set
(
FFTW_FOUND ON
)
endif
()
else
(
SCALFMM_USE_MKL_AS_BLAS
)
...
...
@@ -350,7 +353,7 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_SOURCE_DIR}/CMakeModules/morse/")
if
(
FFT_INCLUDES
)
set
(
SCALFMM_INCLUDES
"
${
SCALFMM_INCLUDES
}
;
${
FFT_INCLUDES
}
"
)
endif
()
if
(
FFTW_FOUND
)
message
(
STATUS
" SCALFMM_LIBRARIES =
${
SCALFMM_LIBRARIES
}
"
)
message
(
STATUS
" SCALFMM_INCLUDES =
${
SCALFMM_INCLUDES
}
"
)
...
...
CMakeModules/morse/ColorizeMessage.cmake
View file @
f484a848
...
...
@@ -28,25 +28,25 @@
###
# Set some colors
if
(
NOT WIN32
)
string
(
ASCII 27 Esc
)
set
(
ColourReset
"
${
Esc
}
[m"
)
set
(
ColourBold
"
${
Esc
}
[1m"
)
set
(
Red
"
${
Esc
}
[31m"
)
set
(
Green
"
${
Esc
}
[32m"
)
set
(
Yellow
"
${
Esc
}
[33m"
)
set
(
Blue
"
${
Esc
}
[34m"
)
set
(
Magenta
"
${
Esc
}
[35m"
)
set
(
Cyan
"
${
Esc
}
[36m"
)
set
(
White
"
${
Esc
}
[37m"
)
set
(
BoldRed
"
${
Esc
}
[1;31m"
)
set
(
BoldGreen
"
${
Esc
}
[1;32m"
)
set
(
BoldYellow
"
${
Esc
}
[1;33m"
)
set
(
BoldBlue
"
${
Esc
}
[1;34m"
)
set
(
BoldMagenta
"
${
Esc
}
[1;35m"
)
set
(
BoldCyan
"
${
Esc
}
[1;36m"
)
set
(
BoldWhite
"
${
Esc
}
[1;37m"
)
endif
()
#
if(NOT WIN32)
#
string(ASCII 27 Esc)
#
set(ColourReset "${Esc}[m")
#
set(ColourBold "${Esc}[1m")
#
set(Red "${Esc}[31m")
#
set(Green "${Esc}[32m")
#
set(Yellow "${Esc}[33m")
#
set(Blue "${Esc}[34m")
#
set(Magenta "${Esc}[35m")
#
set(Cyan "${Esc}[36m")
#
set(White "${Esc}[37m")
#
set(BoldRed "${Esc}[1;31m")
#
set(BoldGreen "${Esc}[1;32m")
#
set(BoldYellow "${Esc}[1;33m")
#
set(BoldBlue "${Esc}[1;34m")
#
set(BoldMagenta "${Esc}[1;35m")
#
set(BoldCyan "${Esc}[1;36m")
#
set(BoldWhite "${Esc}[1;37m")
#
endif()
# Colorize cmake messages during configure
function
(
message
)
...
...
CMakeModules/morse/PrintFindStatus.cmake
View file @
f484a848
...
...
@@ -36,25 +36,25 @@
# Set some colors
if
(
NOT WIN32
)
string
(
ASCII 27 Esc
)
set
(
ColourReset
"
${
Esc
}
[m"
)
set
(
ColourBold
"
${
Esc
}
[1m"
)
set
(
Red
"
${
Esc
}
[31m"
)
set
(
Green
"
${
Esc
}
[32m"
)
set
(
Yellow
"
${
Esc
}
[33m"
)
set
(
Blue
"
${
Esc
}
[34m"
)
set
(
Magenta
"
${
Esc
}
[35m"
)
set
(
Cyan
"
${
Esc
}
[36m"
)
set
(
White
"
${
Esc
}
[37m"
)
set
(
BoldRed
"
${
Esc
}
[1;31m"
)
set
(
BoldGreen
"
${
Esc
}
[1;32m"
)
set
(
BoldYellow
"
${
Esc
}
[1;33m"
)
set
(
BoldBlue
"
${
Esc
}
[1;34m"
)
set
(
BoldMagenta
"
${
Esc
}
[1;35m"
)
set
(
BoldCyan
"
${
Esc
}
[1;36m"
)
set
(
BoldWhite
"
${
Esc
}
[1;37m"
)
endif
()
#
if(NOT WIN32)
#
string(ASCII 27 Esc)
#
set(ColourReset "${Esc}[m")
#
set(ColourBold "${Esc}[1m")
#
set(Red "${Esc}[31m")
#
set(Green "${Esc}[32m")
#
set(Yellow "${Esc}[33m")
#
set(Blue "${Esc}[34m")
#
set(Magenta "${Esc}[35m")
#
set(Cyan "${Esc}[36m")
#
set(White "${Esc}[37m")
#
set(BoldRed "${Esc}[1;31m")
#
set(BoldGreen "${Esc}[1;32m")
#
set(BoldYellow "${Esc}[1;33m")
#
set(BoldBlue "${Esc}[1;34m")
#
set(BoldMagenta "${Esc}[1;35m")
#
set(BoldCyan "${Esc}[1;36m")
#
set(BoldWhite "${Esc}[1;37m")
#
endif()
# This macro informs why the _header_to_find file has not been found
...
...
CMakeModules/morse/find/FindBLAS.cmake
View file @
f484a848
...
...
@@ -63,25 +63,25 @@
# Set some colors
if
(
NOT WIN32
)
string
(
ASCII 27 Esc
)
set
(
ColourReset
"
${
Esc
}
[m"
)
set
(
ColourBold
"
${
Esc
}
[1m"
)
set
(
Red
"
${
Esc
}
[31m"
)
set
(
Green
"
${
Esc
}
[32m"
)
set
(
Yellow
"
${
Esc
}
[33m"
)
set
(
Blue
"
${
Esc
}
[34m"
)
set
(
Magenta
"
${
Esc
}
[35m"
)
set
(
Cyan
"
${
Esc
}
[36m"
)
set
(
White
"
${
Esc
}
[37m"
)
set
(
BoldRed
"
${
Esc
}
[1;31m"
)
set
(
BoldGreen
"
${
Esc
}
[1;32m"
)
set
(
BoldYellow
"
${
Esc
}
[1;33m"
)
set
(
BoldBlue
"
${
Esc
}
[1;34m"
)
set
(
BoldMagenta
"
${
Esc
}
[1;35m"
)
set
(
BoldCyan
"
${
Esc
}
[1;36m"
)
set
(
BoldWhite
"
${
Esc
}
[1;37m"
)
endif
()
#
if(NOT WIN32)
#
string(ASCII 27 Esc)
#
set(ColourReset "${Esc}[m")
#
set(ColourBold "${Esc}[1m")
#
set(Red "${Esc}[31m")
#
set(Green "${Esc}[32m")
#
set(Yellow "${Esc}[33m")
#
set(Blue "${Esc}[34m")
#
set(Magenta "${Esc}[35m")
#
set(Cyan "${Esc}[36m")
#
set(White "${Esc}[37m")
#
set(BoldRed "${Esc}[1;31m")
#
set(BoldGreen "${Esc}[1;32m")
#
set(BoldYellow "${Esc}[1;33m")
#
set(BoldBlue "${Esc}[1;34m")
#
set(BoldMagenta "${Esc}[1;35m")
#
set(BoldCyan "${Esc}[1;36m")
#
set(BoldWhite "${Esc}[1;37m")
#
endif()
## Some macros to print status when search for headers and libs
# This macro informs why the _lib_to_find file has not been found
...
...
CMakeModules/morse/find/FindLAPACK.cmake
View file @
f484a848
...
...
@@ -58,25 +58,25 @@
# Set some colors
if
(
NOT WIN32
)
string
(
ASCII 27 Esc
)
set
(
ColourReset
"
${
Esc
}
[m"
)
set
(
ColourBold
"
${
Esc
}
[1m"
)
set
(
Red
"
${
Esc
}
[31m"
)
set
(
Green
"
${
Esc
}
[32m"
)
set
(
Yellow
"
${
Esc
}
[33m"
)
set
(
Blue
"
${
Esc
}
[34m"
)
set
(
Magenta
"
${
Esc
}
[35m"
)
set
(
Cyan
"
${
Esc
}
[36m"
)
set
(
White
"
${
Esc
}
[37m"
)
set
(
BoldRed
"
${
Esc
}
[1;31m"
)
set
(
BoldGreen
"
${
Esc
}
[1;32m"
)
set
(
BoldYellow
"
${
Esc
}
[1;33m"
)
set
(
BoldBlue
"
${
Esc
}
[1;34m"
)
set
(
BoldMagenta
"
${
Esc
}
[1;35m"
)
set
(
BoldCyan
"
${
Esc
}
[1;36m"
)
set
(
BoldWhite
"
${
Esc
}
[1;37m"
)
endif
()
#
if(NOT WIN32)
#
string(ASCII 27 Esc)
#
set(ColourReset "${Esc}[m")
#
set(ColourBold "${Esc}[1m")
#
set(Red "${Esc}[31m")
#
set(Green "${Esc}[32m")
#
set(Yellow "${Esc}[33m")
#
set(Blue "${Esc}[34m")
#
set(Magenta "${Esc}[35m")
#
set(Cyan "${Esc}[36m")
#
set(White "${Esc}[37m")
#
set(BoldRed "${Esc}[1;31m")
#
set(BoldGreen "${Esc}[1;32m")
#
set(BoldYellow "${Esc}[1;33m")
#
set(BoldBlue "${Esc}[1;34m")
#
set(BoldMagenta "${Esc}[1;35m")
#
set(BoldCyan "${Esc}[1;36m")
#
set(BoldWhite "${Esc}[1;37m")
#
endif()
## Some macros to print status when search for headers and libs
# This macro informs why the _lib_to_find file has not been found
...
...
CMakeModules/morse/find/FindSCALAPACK.cmake
View file @
f484a848
...
...
@@ -53,25 +53,25 @@
# Set some colors
if
(
NOT WIN32
)
string
(
ASCII 27 Esc
)
set
(
ColourReset
"
${
Esc
}
[m"
)
set
(
ColourBold
"
${
Esc
}
[1m"
)
set
(
Red
"
${
Esc
}
[31m"
)
set
(
Green
"
${
Esc
}
[32m"
)
set
(
Yellow
"
${
Esc
}
[33m"
)
set
(
Blue
"
${
Esc
}
[34m"
)
set
(
Magenta
"
${
Esc
}
[35m"
)
set
(
Cyan
"
${
Esc
}
[36m"
)
set
(
White
"
${
Esc
}
[37m"
)
set
(
BoldRed
"
${
Esc
}
[1;31m"
)
set
(
BoldGreen
"
${
Esc
}
[1;32m"
)
set
(
BoldYellow
"
${
Esc
}
[1;33m"
)
set
(
BoldBlue
"
${
Esc
}
[1;34m"
)
set
(
BoldMagenta
"
${
Esc
}
[1;35m"
)
set
(
BoldCyan
"
${
Esc
}
[1;36m"
)
set
(
BoldWhite
"
${
Esc
}
[1;37m"
)
endif
()
#
if(NOT WIN32)
#
string(ASCII 27 Esc)
#
set(ColourReset "${Esc}[m")
#
set(ColourBold "${Esc}[1m")
#
set(Red "${Esc}[31m")
#
set(Green "${Esc}[32m")
#
set(Yellow "${Esc}[33m")
#
set(Blue "${Esc}[34m")
#
set(Magenta "${Esc}[35m")
#
set(Cyan "${Esc}[36m")
#
set(White "${Esc}[37m")
#
set(BoldRed "${Esc}[1;31m")
#
set(BoldGreen "${Esc}[1;32m")
#
set(BoldYellow "${Esc}[1;33m")
#
set(BoldBlue "${Esc}[1;34m")
#
set(BoldMagenta "${Esc}[1;35m")
#
set(BoldCyan "${Esc}[1;36m")
#
set(BoldWhite "${Esc}[1;37m")
#
endif()
## Some macros to print status when search for headers and libs
# This macro informs why the _lib_to_find file has not been found
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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