Commit 753b6564 authored by COULAUD Olivier's avatar COULAUD Olivier

improve installation step

parent 38de838e
......@@ -313,7 +313,7 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/morse_
set(SCALFMM_CXX_FLAGS "${SCALFMM_CXX_FLAGS} ${MPI_CXX_COMPILE_FLAGS}")
endif()
if (MPI_CXX_INCLUDE_PATH)
set(SCALFMM_INCLUDES "${SCALFMM_INCLUDES};${MPI_CXX_INCLUDE_PATH}")
LIST(APPEND SCALFMM_INCLUDES "${SCALFMM_INCLUDES};${MPI_CXX_INCLUDE_PATH}")
endif()
if (MPI_CXX_LINK_FLAGS)
list(APPEND "CMAKE_EXE_LINKER_FLAGS ${MPI_CXX_LINK_FLAGS}")
......@@ -496,7 +496,7 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/morse_
list(APPEND CMAKE_INSTALL_RPATH "${FFTW_LIBRARY_DIRS}")
endif()
if (FFT_INCLUDES)
set(SCALFMM_INCLUDES "${SCALFMM_INCLUDES}; ${FFT_INCLUDES}")
LIST(APPEND SCALFMM_INCLUDES "${FFT_INCLUDES}")
endif()
else(FFTW_FOUND)
message(WARNING "FFTW has not been found, SCALFMM will continue to compile but some applications will be disabled.")
......@@ -627,11 +627,11 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/morse_
# Message
if (STARPU_INCLUDE_DIRS)
message(STATUS " STARPU_INCLUDES = ${STARPU_INCLUDE_DIRS}")
set(SCALFMM_INCLUDES "${SCALFMM_INCLUDES}; ${STARPU_INCLUDE_DIRS}")
LIST(APPEND SCALFMM_INCLUDES "${STARPU_INCLUDE_DIRS}")
endif()
# Adding SimGrid includes
set(SCALFMM_INCLUDES "${SCALFMM_INCLUDES};$ENV{SIMGRID_INCLUDE}")
LIST(APPEND SCALFMM_INCLUDES "$ENV{SIMGRID_INCLUDE}")
message(STATUS " Adding SIMGRID = $ENV{SIMGRID_INCLUDE}")
endif(SCALFMM_USE_STARPU)
list(APPEND FUSE_LIST "STARPU")
......@@ -832,8 +832,8 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/morse_
endforeach()
string(REPLACE " " ";" SCALFMM_LIBRARIES "${SCALFMM_LIBRARIES}")
string(REPLACE ";;" ";" SCALFMM_LIBRARIES "${SCALFMM_LIBRARIES}")
string(REPLACE " " ";" SCALFMM_INCLUDES "${SCALFMM_INCLUDES}")
string(REPLACE ";;" ";" SCALFMM_INCLUDES "${SCALFMM_INCLUDES}")
# string(REPLACE " " ";" SCALFMM_INCLUDES "${SCALFMM_INCLUDES}")
# string(REPLACE ";;" ";" SCALFMM_INCLUDES "${SCALFMM_INCLUDES}")
configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/Src/ScalFmmConfig.h.cmake
${CMAKE_CURRENT_BINARY_DIR}/Src/ScalFmmConfig.h )
#
......@@ -842,6 +842,7 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/morse_
##################################################################
#
MESSAGE(STATUS "FUSE : ${FUSE_LIST} ")
add_subdirectory(Contribs)
add_subdirectory(Src)
# Link with scalfmm lib
set(scalfmm_lib scalfmm)
......@@ -895,16 +896,16 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/morse_
# Build - Addons #
##################################################################
#
if( SCALFMM_USE_ADDONS )
file(GLOB all_addons ./Addons/*)
# Options
option( SCALFMM_ADDON_CKERNELAPI "Set to ON to build ScaFMM FMM API interface" OFF )
foreach(addon_name ${all_addons})
message(STATUS "Addons += ${addon_name}" )
add_subdirectory(${addon_name})
endforeach()
endif()
# SCALFMM_ADDON_CKERNELAPI doesn't works with scalfmm 2.0
# if( SCALFMM_USE_ADDONS )
# file(GLOB all_addons ./Addons/*)
# # Options
# option( SCALFMM_ADDON_CKERNELAPI "Set to ON to build ScaFMM FMM API interface" OFF )
# foreach(addon_name ${all_addons})
# message(STATUS "Addons += ${addon_name}" )
# add_subdirectory(${addon_name})
# endforeach()
# endif()
# Add custom clean command
if("${CMAKE_GENERATOR}" MATCHES "Make")
......
......@@ -298,7 +298,7 @@ struct parameter_handle {
auto& single_data = data_descriptor::get(data);
try {
this->param_set |= parse_parameter(*this, single_data, args, current_arg);
} catch(unknown_parameter) {
} catch(unknown_parameter&) {
// thrown when sub-parsers reach a parameter they don't know
this->param_set = true;
}
......
......@@ -87,17 +87,14 @@ INCLUDE_DIRECTORIES(
install( TARGETS scalfmm DESTINATION lib )
# Install header
SET(my_include_dirs "."
"Arranger" "Core" "Utils"
"Kernels/Chebyshev" "Components" "Extensions"
"Containers" "Files" "Kernels/Spherical"
"Kernels/P2P" "Kernels/Taylor" "Kernels/ROtation"
"Kernels/Uniform" "Kernels/Interpolation")
if(SCALFMM_ONLY_DEVEL)
SET(my_include_dirs ${my_include_dirs} "GroupTree/Chebyshev" "GroupTree/Core" "GroupTree/Cuda" "GroupTree/OpenCl"
"GroupTree/Rotation" "GroupTree/StarPUUtils" "GroupTree/Taylor" "GroupTree/TestKernel" "GroupTree/Uniform")
endif()
SET(my_include_dirs "." "Adaptive"
"Arranger" "Components" "Containers" "Core" "Extensions"
"Files" "Utils" )
INSTALL( DIRECTORY "Kernels" DESTINATION include FILES_MATCHING PATTERN "*.hpp")
INSTALL( DIRECTORY "GroupTree" DESTINATION include )
# FILES_MATCHING PATTERN "*.hpp" PATTERN "*.h" PATTERN "*.cu" PATTERN "*.cu")
FOREACH(my_dir ${my_include_dirs})
file(GLOB
......@@ -107,5 +104,6 @@ FOREACH(my_dir ${my_include_dirs})
INSTALL( FILES ${hpp_in_dir} DESTINATION include/${my_dir} )
ENDFOREACH()
INSTALL( FILES "${SCALFMM_BINARY_DIR}/Src/ScalFmmConfig.h" DESTINATION include/${my_dir} )
......@@ -8,15 +8,15 @@
#include <vector>
#include <functional>
#include "../../Utils/FAssert.hpp"
#include "../../Utils/FPoint.hpp"
#include "../../Utils/FQuickSort.hpp"
#include "../../Containers/FTreeCoordinate.hpp"
#include "../../Containers/FCoordinateComputer.hpp"
#include "Utils/FAssert.hpp"
#include "Utils/FPoint.hpp"
#include "Utils/FQuickSort.hpp"
#include "Containers/FTreeCoordinate.hpp"
#include "Containers/FCoordinateComputer.hpp"
#include "FGroupOfCells.hpp"
#include "FGroupOfParticles.hpp"
#include "FGroupAttachedLeaf.hpp"
#include "../../Src/Kernels/P2P/FP2PParticleContainer.hpp"
#include "Kernels/P2P/FP2PParticleContainer.hpp"
#ifdef SCALFMM_USE_MPI
#include "FDistributedGroupTreeBuilder.hpp"
#endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment