From f795413f2d617a2951620ae1ad4305c78b406e8c Mon Sep 17 00:00:00 2001 From: Alex James Wright Date: Mon, 29 Mar 2021 20:23:19 +0100 Subject: [PATCH] Fix for travis --- Project/CPU/CMakeLists.txt | 114 +++++++++++++++++++------------------ 1 file changed, 60 insertions(+), 54 deletions(-) diff --git a/Project/CPU/CMakeLists.txt b/Project/CPU/CMakeLists.txt index f943bc74..e51936b7 100644 --- a/Project/CPU/CMakeLists.txt +++ b/Project/CPU/CMakeLists.txt @@ -13,30 +13,30 @@ endif() target_sources( Cmin PRIVATE - ${CMAKE_CURRENT_LIST_DIR}/Src/backRKArgs.cc - ${CMAKE_CURRENT_LIST_DIR}/Src/backwardsRK.cc - ${CMAKE_CURRENT_LIST_DIR}/Src/boundaryConds.cc - ${CMAKE_CURRENT_LIST_DIR}/Src/fluxVectorSplitting.cc - ${CMAKE_CURRENT_LIST_DIR}/Src/IMEX2Args.cc - ${CMAKE_CURRENT_LIST_DIR}/Src/IMEX3Args.cc - ${CMAKE_CURRENT_LIST_DIR}/Src/initFunc.cc - ${CMAKE_CURRENT_LIST_DIR}/Src/RK2.cc - ${CMAKE_CURRENT_LIST_DIR}/Src/rkSplit.cc - ${CMAKE_CURRENT_LIST_DIR}/Src/serialSaveData.cc - # ${CMAKE_CURRENT_LIST_DIR}/Src/serialSaveDataHDF5.cc - ${CMAKE_CURRENT_LIST_DIR}/Src/serialEnv.cc - ${CMAKE_CURRENT_LIST_DIR}/Src/simData.cc - ${CMAKE_CURRENT_LIST_DIR}/Src/simulation.cc - ${CMAKE_CURRENT_LIST_DIR}/Src/srmhd.cc - ${CMAKE_CURRENT_LIST_DIR}/Src/srrmhd.cc - ${CMAKE_CURRENT_LIST_DIR}/Src/REGIME.cc - ${CMAKE_CURRENT_LIST_DIR}/Src/SSP2.cc - ${CMAKE_CURRENT_LIST_DIR}/Src/SSP3.cc - ${CMAKE_CURRENT_LIST_DIR}/Src/SSP2322.cc - ${CMAKE_CURRENT_LIST_DIR}/Src/twoFluidEMHD.cc - ${CMAKE_CURRENT_LIST_DIR}/Src/weno.cc - ${CMAKE_CURRENT_LIST_DIR}/Src/wenoUpwinds.cc - ${CMAKE_CURRENT_LIST_DIR}/Src/RKPlus.cc + ${CMAKE_CURRENT_LIST_DIR}/Src/TimeIntegrators/backRKArgs.cc + ${CMAKE_CURRENT_LIST_DIR}/Src/TimeIntegrators/backwardsRK.cc + ${CMAKE_CURRENT_LIST_DIR}/Src/BoundaryConditions/boundaryConds.cc + ${CMAKE_CURRENT_LIST_DIR}/Src/Flux/fluxVectorSplitting.cc + ${CMAKE_CURRENT_LIST_DIR}/Src/TimeIntegrators/IMEX2Args.cc + ${CMAKE_CURRENT_LIST_DIR}/Src/TimeIntegrators/IMEX3Args.cc + ${CMAKE_CURRENT_LIST_DIR}/Src/InitialData/initFunc.cc + ${CMAKE_CURRENT_LIST_DIR}/Src/TimeIntegrators/RK2.cc + ${CMAKE_CURRENT_LIST_DIR}/Src/TimeIntegrators/rkSplit.cc + ${CMAKE_CURRENT_LIST_DIR}/Src/DataIO/serialSaveData.cc + # ${CMAKE_CURRENT_LIST_DIR}/Src/DataIO/serialSaveDataHDF5.cc + ${CMAKE_CURRENT_LIST_DIR}/Src/Simulation/serialEnv.cc + ${CMAKE_CURRENT_LIST_DIR}/Src/Simulation/simData.cc + ${CMAKE_CURRENT_LIST_DIR}/Src/Simulation/simulation.cc + ${CMAKE_CURRENT_LIST_DIR}/Src/Physics/srmhd.cc + ${CMAKE_CURRENT_LIST_DIR}/Src/Physics/srrmhd.cc + ${CMAKE_CURRENT_LIST_DIR}/Src/Physics/REGIME.cc + ${CMAKE_CURRENT_LIST_DIR}/Src/TimeIntegrators/SSP2.cc + ${CMAKE_CURRENT_LIST_DIR}/Src/TimeIntegrators/SSP3.cc + ${CMAKE_CURRENT_LIST_DIR}/Src/TimeIntegrators/SSP2322.cc + ${CMAKE_CURRENT_LIST_DIR}/Src/Physics/twoFluidEMHD.cc + ${CMAKE_CURRENT_LIST_DIR}/Src/Flux/weno.cc + ${CMAKE_CURRENT_LIST_DIR}/Src/Flux/wenoUpwinds.cc + ${CMAKE_CURRENT_LIST_DIR}/Src/TimeIntegrators/RKPlus.cc ${CMAKE_CURRENT_LIST_DIR}/CminpackLibrary/Src/dogleg.cc ${CMAKE_CURRENT_LIST_DIR}/CminpackLibrary/Src/dpmpar.cc @@ -49,35 +49,35 @@ target_sources( ${CMAKE_CURRENT_LIST_DIR}/CminpackLibrary/Src/r1mpyq.cc ${CMAKE_CURRENT_LIST_DIR}/CminpackLibrary/Src/r1updt.cc PUBLIC - ${CMAKE_CURRENT_LIST_DIR}/Include/backRKArgs.h - ${CMAKE_CURRENT_LIST_DIR}/Include/backwardsRK.h - ${CMAKE_CURRENT_LIST_DIR}/Include/boundaryConds.h - ${CMAKE_CURRENT_LIST_DIR}/Include/flux.h - ${CMAKE_CURRENT_LIST_DIR}/Include/fluxVectorSplitting.h - ${CMAKE_CURRENT_LIST_DIR}/Include/IMEX2Args.h - ${CMAKE_CURRENT_LIST_DIR}/Include/IMEX3Args.h - ${CMAKE_CURRENT_LIST_DIR}/Include/initFunc.h - ${CMAKE_CURRENT_LIST_DIR}/Include/model.h - ${CMAKE_CURRENT_LIST_DIR}/Include/RK2.h - ${CMAKE_CURRENT_LIST_DIR}/Include/rkSplit.h - ${CMAKE_CURRENT_LIST_DIR}/Include/saveData.h - ${CMAKE_CURRENT_LIST_DIR}/Include/serialSaveData.h - # ${CMAKE_CURRENT_LIST_DIR}/Include/serialSaveDataHDF5.h - ${CMAKE_CURRENT_LIST_DIR}/Include/platformEnv.h - ${CMAKE_CURRENT_LIST_DIR}/Include/serialEnv.h - ${CMAKE_CURRENT_LIST_DIR}/Include/simData.h - ${CMAKE_CURRENT_LIST_DIR}/Include/simulation.h - ${CMAKE_CURRENT_LIST_DIR}/Include/srmhd.h - ${CMAKE_CURRENT_LIST_DIR}/Include/srrmhd.h - ${CMAKE_CURRENT_LIST_DIR}/Include/SSP2.h - ${CMAKE_CURRENT_LIST_DIR}/Include/SSP3.h - ${CMAKE_CURRENT_LIST_DIR}/Include/SSP2322.h - ${CMAKE_CURRENT_LIST_DIR}/Include/modelExtension.h - ${CMAKE_CURRENT_LIST_DIR}/Include/REGIME.h - ${CMAKE_CURRENT_LIST_DIR}/Include/timeInt.h - ${CMAKE_CURRENT_LIST_DIR}/Include/twoFluidEMHD.h - ${CMAKE_CURRENT_LIST_DIR}/Include/wenoUpwinds.h - ${CMAKE_CURRENT_LIST_DIR}/Include/RKPlus.h + ${CMAKE_CURRENT_LIST_DIR}/Include/TimeIntegrators/backRKArgs.h + ${CMAKE_CURRENT_LIST_DIR}/Include/TimeIntegrators/backwardsRK.h + ${CMAKE_CURRENT_LIST_DIR}/Include/BoundaryConditions/boundaryConds.h + ${CMAKE_CURRENT_LIST_DIR}/Include/Flux/flux.h + ${CMAKE_CURRENT_LIST_DIR}/Include/Flux/fluxVectorSplitting.h + ${CMAKE_CURRENT_LIST_DIR}/Include/TimeIntegrators/IMEX2Args.h + ${CMAKE_CURRENT_LIST_DIR}/Include/TimeIntegrators/IMEX3Args.h + ${CMAKE_CURRENT_LIST_DIR}/Include/InitialData/initFunc.h + ${CMAKE_CURRENT_LIST_DIR}/Include/Physics/model.h + ${CMAKE_CURRENT_LIST_DIR}/Include/TimeIntegrators/RK2.h + ${CMAKE_CURRENT_LIST_DIR}/Include/TimeIntegrators/rkSplit.h + ${CMAKE_CURRENT_LIST_DIR}/Include/DataIO/saveData.h + ${CMAKE_CURRENT_LIST_DIR}/Include/DataIO/serialSaveData.h + # ${CMAKE_CURRENT_LIST_DIR}/Include/DataIO/serialSaveDataHDF5.h + ${CMAKE_CURRENT_LIST_DIR}/Include/Simulation/platformEnv.h + ${CMAKE_CURRENT_LIST_DIR}/Include/Simulation/serialEnv.h + ${CMAKE_CURRENT_LIST_DIR}/Include/Simulation/simData.h + ${CMAKE_CURRENT_LIST_DIR}/Include/Simulation/simulation.h + ${CMAKE_CURRENT_LIST_DIR}/Include/Physics/srmhd.h + ${CMAKE_CURRENT_LIST_DIR}/Include/Physics/srrmhd.h + ${CMAKE_CURRENT_LIST_DIR}/Include/TimeIntegrators/SSP2.h + ${CMAKE_CURRENT_LIST_DIR}/Include/TimeIntegrators/SSP3.h + ${CMAKE_CURRENT_LIST_DIR}/Include/TimeIntegrators/SSP2322.h + ${CMAKE_CURRENT_LIST_DIR}/Include/Physics/modelExtension.h + ${CMAKE_CURRENT_LIST_DIR}/Include/Physics/REGIME.h + ${CMAKE_CURRENT_LIST_DIR}/Include/TimeIntegrators/timeInt.h + ${CMAKE_CURRENT_LIST_DIR}/Include/Physics/twoFluidEMHD.h + ${CMAKE_CURRENT_LIST_DIR}/Include/Flux/wenoUpwinds.h + ${CMAKE_CURRENT_LIST_DIR}/Include/TimeIntegrators/RKPlus.h ${CMAKE_CURRENT_LIST_DIR}/CminpackLibrary/Include/cminpack.h ${CMAKE_CURRENT_LIST_DIR}/CminpackLibrary/Include/cminpackP.h @@ -88,6 +88,12 @@ target_sources( target_include_directories( Cmin PUBLIC - ${CMAKE_CURRENT_LIST_DIR}/Include + ${CMAKE_CURRENT_LIST_DIR}/Include/Simulation + ${CMAKE_CURRENT_LIST_DIR}/Include/Flux + ${CMAKE_CURRENT_LIST_DIR}/Include/TimeIntegrators + ${CMAKE_CURRENT_LIST_DIR}/Include/DataIO + ${CMAKE_CURRENT_LIST_DIR}/Include/Physics + ${CMAKE_CURRENT_LIST_DIR}/Include/InitialData + ${CMAKE_CURRENT_LIST_DIR}/Include/BoundaryConditions ${CMAKE_CURRENT_LIST_DIR}/CminpackLibrary/Include )