From 9d781038639470fd3c5d4c1fb9066684fc1c6e53 Mon Sep 17 00:00:00 2001 From: markus holzer <markus.holzer@fau.de> Date: Tue, 5 Jan 2021 15:29:27 +0100 Subject: [PATCH] Added ifs in CMake --- apps/benchmarks/CMakeLists.txt | 23 +++++++++++++------ apps/benchmarks/UniformGridGPU/CMakeLists.txt | 1 + apps/showcases/CMakeLists.txt | 2 +- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/apps/benchmarks/CMakeLists.txt b/apps/benchmarks/CMakeLists.txt index ec223734f..d16b4255d 100644 --- a/apps/benchmarks/CMakeLists.txt +++ b/apps/benchmarks/CMakeLists.txt @@ -1,7 +1,6 @@ add_subdirectory( AdaptiveMeshRefinementFluidParticleCoupling ) add_subdirectory( ComplexGeometry ) add_subdirectory( DEM ) -add_subdirectory( FieldCommunication ) add_subdirectory( MeshDistance ) add_subdirectory( CouetteFlow ) add_subdirectory( FluidParticleCoupling ) @@ -15,10 +14,20 @@ add_subdirectory( PoiseuilleChannel ) add_subdirectory( ProbeVsExtraMessage ) add_subdirectory( SchaeferTurek ) add_subdirectory( UniformGrid ) -if ( WALBERLA_BUILD_WITH_CODEGEN AND WALBERLA_BUILD_WITH_PYTHON ) -add_subdirectory( UniformGridGenerated ) -add_subdirectory( PhaseFieldAllenCahn ) -endif() -if ( WALBERLA_BUILD_WITH_CODEGEN AND WALBERLA_BUILD_WITH_CUDA ) -add_subdirectory( UniformGridGPU ) + +if ( WALBERLA_BUILD_WITH_PYTHON ) + add_subdirectory( FieldCommunication ) + + if ( WALBERLA_BUILD_WITH_CODEGEN ) + add_subdirectory( UniformGridGenerated ) + add_subdirectory( PhaseFieldAllenCahn ) + endif() + + if ( WALBERLA_BUILD_WITH_CODEGEN AND WALBERLA_BUILD_WITH_CUDA ) + add_subdirectory( UniformGridGPU ) + endif() + endif() + + + diff --git a/apps/benchmarks/UniformGridGPU/CMakeLists.txt b/apps/benchmarks/UniformGridGPU/CMakeLists.txt index 9fe54701f..29755644d 100644 --- a/apps/benchmarks/UniformGridGPU/CMakeLists.txt +++ b/apps/benchmarks/UniformGridGPU/CMakeLists.txt @@ -1,5 +1,6 @@ waLBerla_link_files_to_builddir( "*.prm" ) +waLBerla_link_files_to_builddir( "*.py" ) waLBerla_link_files_to_builddir( "simulation_setup" ) diff --git a/apps/showcases/CMakeLists.txt b/apps/showcases/CMakeLists.txt index cfdbf9591..30592ee71 100644 --- a/apps/showcases/CMakeLists.txt +++ b/apps/showcases/CMakeLists.txt @@ -3,6 +3,6 @@ add_subdirectory( CombinedResolvedUnresolved ) add_subdirectory( HeatConduction ) add_subdirectory( Mixer ) add_subdirectory( PegIntoSphereBed ) -if ( WALBERLA_BUILD_WITH_CODEGEN) +if ( WALBERLA_BUILD_WITH_CODEGEN AND WALBERLA_BUILD_WITH_PYTHON ) add_subdirectory( PhaseFieldAllenCahn ) endif() -- GitLab