diff --git a/solvers/ADRSolver/CMakeLists.txt b/solvers/ADRSolver/CMakeLists.txt index 089b68a52322fe70ceccdee3b9c280af1ccb5189..c4656e6f64fb527d31082881f055d30b1537a7f3 100644 --- a/solvers/ADRSolver/CMakeLists.txt +++ b/solvers/ADRSolver/CMakeLists.txt @@ -7,7 +7,7 @@ IF (NOT NEKTAR_BUILD_SOLVERS) ENDIF() IF( NEKTAR_SOLVER_ADR ) - SET(ADRSolverSource + ADD_SOLVER_EXECUTABLE(ADRSolver SOURCES ./ADRSolver.cpp ./EquationSystems/Helmholtz.cpp ./EquationSystems/Laplace.cpp @@ -22,8 +22,6 @@ IF( NEKTAR_SOLVER_ADR ) ./EquationSystems/UnsteadyViscousBurgers.cpp ./EquationSystems/EigenValuesAdvection.cpp) - ADD_SOLVER_EXECUTABLE(ADRSolver SOURCES ${ADRSolverSource}) - # 1D discontinuous advection (weak DG/flux reconstruction) ADD_NEKTAR_TEST(Advection1D_FRDG_GLL_LAGRANGE_SEM LENGTHY) ADD_NEKTAR_TEST(Advection1D_FRDG_GAUSS_LAGRANGE) diff --git a/solvers/VortexWaveInteraction/CMakeLists.txt b/solvers/VortexWaveInteraction/CMakeLists.txt index 4b5f0a3013e0e14ecc30307f90432a3ee733a5ed..c49e9a18eb3a826b5863ec35f64cbe6e9d5f727b 100644 --- a/solvers/VortexWaveInteraction/CMakeLists.txt +++ b/solvers/VortexWaveInteraction/CMakeLists.txt @@ -1,8 +1,8 @@ CMAKE_DEPENDENT_OPTION(NEKTAR_SOLVER_VORTEXWAVE "Build the Vortex-Wave interaction solver." ON - "NEKTAR_BUILD_SOLVERS" OFF) + "NEKTAR_BUILD_SOLVERS;NEKTAR_SOLVER_INCNAVIERSTOKES" OFF) -IF (NOT NEKTAR_BUILD_SOLVERS) +IF (NOT NEKTAR_BUILD_SOLVERS OR NOT NEKTAR_SOLVER_INCNAVIERSTOKES) SET(NEKTAR_SOLVER_VORTEXWAVE OFF CACHE INTERNAL "") ENDIF() @@ -19,7 +19,6 @@ IF( NEKTAR_SOLVER_VORTEXWAVE ) ../ADRSolver/EquationSystems/SteadyAdvectionDiffusion.cpp ../ADRSolver/EquationSystems/SteadyAdvectionDiffusionReaction.cpp ./CalcL2ToLinfPressure.cpp - ./VortexWaveInteraction.h ./VortexWaveInteraction.cpp $ )