Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
solverstack
ScalFMM
Commits
63d50460
Commit
63d50460
authored
May 19, 2015
by
BRAMAS Berenger
Browse files
remove whitspace from libraries variable
parent
3ba6a294
Changes
1
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
63d50460
...
...
@@ -248,10 +248,10 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_SOURCE_DIR}/CMakeModules/morse/")
set
(
SCALFMM_INCLUDES
"
${
SCALFMM_INCLUDES
}
;
${
MPI_CXX_INCLUDE_PATH
}
"
)
endif
()
if
(
MPI_CXX_LINK_FLAGS
)
set
(
SCALFMM_LIBRARIES
"
${
SCALFMM_LIBRARIES
}
;
${
MPI_CXX_LINK_FLAGS
}
"
)
set
(
SCALFMM_LIBRARIES
"
${
SCALFMM_LIBRARIES
}
;
${
MPI_CXX_LINK_FLAGS
}
"
)
endif
()
if
(
MPI_CXX_LIBRARIES
)
set
(
SCALFMM_LIBRARIES
"
${
SCALFMM_LIBRARIES
}
;
${
MPI_CXX_LIBRARIES
}
"
)
set
(
SCALFMM_LIBRARIES
"
${
SCALFMM_LIBRARIES
}
;
${
MPI_CXX_LIBRARIES
}
"
)
endif
()
endif
()
...
...
@@ -292,7 +292,7 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_SOURCE_DIR}/CMakeModules/morse/")
endif
()
if
(
BLAS_FOUND
)
set
(
SCALFMM_LIBRARIES
"
${
SCALFMM_LIBRARIES
}
;
${
BLASLAPACK_LIBRARIES
}
"
)
set
(
SCALFMM_LIBRARIES
"
${
SCALFMM_LIBRARIES
}
;
${
BLASLAPACK_LIBRARIES
}
"
)
#message(STATUS "SCALFMM_LIBRARIES = ${SCALFMM_LIBRARIES}")
else
()
message
(
WARNING
"BLAS has not been found, SCALFMM will continue to compile but some applications will be disabled."
)
...
...
@@ -335,12 +335,12 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_SOURCE_DIR}/CMakeModules/morse/")
endif
()
if
(
FFTW_LIBRARIES_DEP
)
foreach
(
fft_lib
${
FFTW_LIBRARIES_DEP
}
)
set
(
FFT_LIBRARIES
"
${
FFT_LIBRARIES
}
${
fft_lib
}
;"
)
set
(
FFT_LIBRARIES
"
${
FFT_LIBRARIES
}
;
${
fft_lib
}
;"
)
endforeach
()
endif
()
set
(
FFT_INCLUDES
"
${
FFTW_INCLUDE_DIRS_DEP
}
"
)
if
(
FFT_LIBRARIES
)
set
(
SCALFMM_LIBRARIES
"
${
SCALFMM_LIBRARIES
}
;
${
FFT_LIBRARIES
}
"
)
set
(
SCALFMM_LIBRARIES
"
${
SCALFMM_LIBRARIES
}
;
${
FFT_LIBRARIES
}
"
)
endif
()
endif
(
SCALFMM_USE_MKL_AS_BLAS
)
...
...
@@ -357,12 +357,12 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_SOURCE_DIR}/CMakeModules/morse/")
endif
()
if
(
FFTW_LIBRARIES_DEP
)
foreach
(
fft_lib
${
FFTW_LIBRARIES_DEP
}
)
set
(
FFT_LIBRARIES
"
${
FFT_LIBRARIES
}
${
fft_lib
}
;"
)
set
(
FFT_LIBRARIES
"
${
FFT_LIBRARIES
}
;
${
fft_lib
}
;"
)
endforeach
()
endif
()
set
(
FFT_INCLUDES
"
${
FFTW_INCLUDE_DIRS_DEP
}
"
)
if
(
FFT_LIBRARIES
)
set
(
SCALFMM_LIBRARIES
"
${
SCALFMM_LIBRARIES
}
;
${
FFT_LIBRARIES
}
"
)
set
(
SCALFMM_LIBRARIES
"
${
SCALFMM_LIBRARIES
}
;
${
FFT_LIBRARIES
}
"
)
endif
()
endif
(
SCALFMM_USE_MKL_AS_FFTW
)
...
...
@@ -434,7 +434,7 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_SOURCE_DIR}/CMakeModules/morse/")
include_directories
(
${
CUDA_INCLUDE_DIRS
}
)
endif
()
if
(
CUDA_LIBRARIES
)
set
(
SCALFMM_LIBRARIES
"
${
SCALFMM_LIBRARIES
}
;
${
CUDA_LIBRARIES
}
"
)
set
(
SCALFMM_LIBRARIES
"
${
SCALFMM_LIBRARIES
}
;
${
CUDA_LIBRARIES
}
"
)
endif
()
set
(
CUDA_NEEDED_INCLUDE_DIRS
${
CMAKE_BINARY_DIR
}
/Src
)
...
...
@@ -458,22 +458,22 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_SOURCE_DIR}/CMakeModules/morse/")
include_directories
(
${
STARPU_INCLUDE_DIRS_DEP
}
)
foreach
(
starpu_libdir
${
STARPU_LIBRARY_DIRS_DEP
}
)
if
(
${
starpu_libdir
}
MATCHES
"^ *-L"
)
set
(
SCALFMM_LIBRARIES
"
${
SCALFMM_LIBRARIES
}
;
${
starpu_libdir
}
"
)
set
(
SCALFMM_LIBRARIES
"
${
SCALFMM_LIBRARIES
}
;
${
starpu_libdir
}
"
)
else
()
set
(
SCALFMM_LIBRARIES
"
${
SCALFMM_LIBRARIES
}
;
-L
${
starpu_libdir
}
"
)
set
(
SCALFMM_LIBRARIES
"
${
SCALFMM_LIBRARIES
}
;-L
${
starpu_libdir
}
"
)
endif
()
endforeach
()
foreach
(
starpu_lib
${
STARPU_LIBRARIES_DEP
}
)
if
(
EXISTS
${
starpu_lib
}
OR
${
starpu_lib
}
MATCHES
"^ *-"
)
set
(
SCALFMM_LIBRARIES
"
${
SCALFMM_LIBRARIES
}
;
${
starpu_lib
}
"
)
set
(
SCALFMM_LIBRARIES
"
${
SCALFMM_LIBRARIES
}
;
${
starpu_lib
}
"
)
else
()
set
(
SCALFMM_LIBRARIES
"
${
SCALFMM_LIBRARIES
}
;
-l
${
starpu_lib
}
"
)
set
(
SCALFMM_LIBRARIES
"
${
SCALFMM_LIBRARIES
}
;-l
${
starpu_lib
}
"
)
endif
()
endforeach
()
# TODO: is this very useful? CUDA is already a component of find starpu
if
(
CUDA_LIBRARIES
)
set
(
SCALFMM_LIBRARIES
"
${
SCALFMM_LIBRARIES
}
;
${
CUDA_LIBRARIES
}
"
)
set
(
SCALFMM_LIBRARIES
"
${
SCALFMM_LIBRARIES
}
;
${
CUDA_LIBRARIES
}
"
)
endif
()
# Message
...
...
@@ -488,7 +488,7 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_SOURCE_DIR}/CMakeModules/morse/")
MESSAGE
(
STATUS
"SCALFMM_USE_OPENCL =
${
SCALFMM_USE_OPENCL
}
"
)
if
(
SCALFMM_USE_OPENCL
)
include_directories
(
$ENV{OPENCL_INC}
)
SET
(
SCALFMM_LIBRARIES
"
${
SCALFMM_LIBRARIES
}
;
-L$ENV{OPENCL_LIB};
-lOpenCL"
)
SET
(
SCALFMM_LIBRARIES
"
${
SCALFMM_LIBRARIES
}
;-L$ENV{OPENCL_LIB};-lOpenCL"
)
endif
()
endif
(
SCALFMM_USE_STARPU
)
list
(
APPEND FUSE_LIST
"STARPU"
)
...
...
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