From a7998c79561efa27314fb93a8609e9d57517eeb4 Mon Sep 17 00:00:00 2001 From: Incardona Pietro <incardon@mpi-cbg.de> Date: Sun, 28 Feb 2021 23:42:03 +0100 Subject: [PATCH] Fixing COMPONENT for VCluster --- CMakeLists.txt | 2 ++ src/CMakeLists.txt | 11 +++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 432e785..0c8e66c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,6 +15,8 @@ set(PETSC_ROOT CACHE PATH "If compiling with linear algebra indicate the PETSC r set(ALPAKA_ROOT CACHE PATH "Alpaka root path") set(CUDA_ON_CPU CACHE BOOL "Make Cuda work on heap") +execute_process(COMMAND bash -c "cp ${CMAKE_CURRENT_SOURCE_DIR}/src/VCluster/VCluster.cpp ${CMAKE_CURRENT_SOURCE_DIR}/src/VCluster/VCluster_cuda_on_cpu.cpp") + if (ENABLE_GPU) set(CUDA_ON_CPU OFF) enable_language(CUDA) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9e7fdc3..449f10b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -139,22 +139,25 @@ if (CUDA_FOUND AND NOT CUDA_ON_CPU) set(ADDITIONAL_OPENFPM_LIBS vcluster_cuda_on_cpu vcluster_dl_cuda_on_cpu) endif() -install(TARGETS vcluster vcluster_dl ${ADDITIONAL_OPENFPM_LIBS} DESTINATION openfpm_vcluster/lib) +install(TARGETS vcluster vcluster_dl ${ADDITIONAL_OPENFPM_LIBS} DESTINATION openfpm_vcluster/lib COMPONENT OpenFPM) install(FILES MPI_wrapper/MPI_IallreduceW.hpp MPI_wrapper/MPI_IrecvW.hpp MPI_wrapper/MPI_IBcastW.hpp MPI_wrapper/MPI_IsendW.hpp MPI_wrapper/MPI_util.hpp MPI_wrapper/MPI_IAllGather.hpp - DESTINATION openfpm_vcluster/include/MPI_wrapper) + DESTINATION openfpm_vcluster/include/MPI_wrapper + COMPONENT OpenFPM) install(FILES VCluster/VCluster_base.hpp VCluster/VCluster.hpp VCluster/VCluster_meta_function.hpp - DESTINATION openfpm_vcluster/include/VCluster ) + DESTINATION openfpm_vcluster/include/VCluster + COMPONENT OpenFPM) install (FILES util/Vcluster_log.hpp - DESTINATION openfpm_vcluster/include/util) + DESTINATION openfpm_vcluster/include/util + COMPONENT OpenFPM) #if(BUILD_TESTING) -- GitLab