changed: only add conditionally built files if they are to be built

instead of unconditionally adding, and then conditionally removing
again.

CMakeLists.txt

@@ -85,33 +85,6 @@ macro (prereqs_hook)
 endmacro (prereqs_hook)
 
 macro (sources_hook)
-  if (NOT SuiteSparse_FOUND)
-    list (REMOVE_ITEM examples_SOURCES
-      ${PROJECT_SOURCE_DIR}/tutorials/tutorial2.cpp
-      ${PROJECT_SOURCE_DIR}/tutorials/tutorial3.cpp
-      ${PROJECT_SOURCE_DIR}/tutorials/tutorial4.cpp
-      )
-  endif()
-
-  # these solvers are only compiled in if their dependency is found
-  if (NOT dune-istl_FOUND)
-    list (REMOVE_ITEM opm-simulators_SOURCES
-      ${PROJECT_SOURCE_DIR}/opm/core/linalg/LinearSolverIstl.cpp
-      )
-  endif ()
-
-  if (NOT PETSc_FOUND)
-    list (REMOVE_ITEM opm-simulators_SOURCES
-      ${PROJECT_SOURCE_DIR}/opm/core/linalg/LinearSolverPetsc.cpp
-      )
-  endif ()
-
-  if ((NOT MPI_FOUND) OR (NOT DUNE_ISTL_FOUND))
-    list (REMOVE_ITEM tests_SOURCES
-      ${PROJECT_SOURCE_DIR}/tests/test_parallel_linearsolver.cpp
-      ${PROJECT_SOURCE_DIR}/tests/test_parallelistlinformation.cpp
-      )
-  endif ()
 endmacro (sources_hook)
 
 macro (fortran_hook)

CMakeLists_files.cmake

@@ -1,6 +1,3 @@
-# -*- mode: cmake; tab-width: 2; indent-tabs-mode: t; truncate-lines: t; compile-command: "cmake -Wdev" -*-
-# vim: set filetype=cmake autoindent tabstop=2 shiftwidth=2 noexpandtab softtabstop=2 nowrap:
-
 # This file sets up five lists:
 # MAIN_SOURCE_FILES     List of compilation units which will be included in
 #                       the library. If it isn't on this list, it won't be
@@ -64,7 +61,6 @@ list (APPEND MAIN_SOURCE_FILES
   opm/core/linalg/LinearSolverFactory.cpp
   opm/core/linalg/LinearSolverInterface.cpp
   opm/core/linalg/LinearSolverIstl.cpp
-  opm/core/linalg/LinearSolverPetsc.cpp
   opm/core/linalg/LinearSolverUmfpack.cpp
   opm/core/linalg/call_umfpack.c
   opm/core/linalg/sparse_sys.c
@@ -131,6 +127,10 @@ list (APPEND MAIN_SOURCE_FILES
   opm/simulators/timestepping/SimulatorTimer.cpp
   )
 
+if(PETSc_FOUND)
+  list(APPEND MAIN_SOURCE_FILES opm/core/linalg/LinearSolverPetsc.cpp)
+endif()
+
 
 # originally generated with the command:
 # find tests -name '*.cpp' -a ! -wholename '*/not-unit/*' -printf '\t%p\n' | sort
@@ -156,10 +156,8 @@ list (APPEND TEST_SOURCE_FILES
   tests/test_event.cpp
   tests/test_dgbasis.cpp
   tests/test_flowdiagnostics.cpp
-  tests/test_parallelistlinformation.cpp
   tests/test_wells.cpp
   tests/test_linearsolver.cpp
-  tests/test_parallel_linearsolver.cpp
   tests/test_satfunc.cpp
   tests/test_shadow.cpp
   tests/test_equil_legacy.cpp
@@ -175,6 +173,11 @@ list (APPEND TEST_SOURCE_FILES
   tests/test_norne_pvt.cpp
   )
 
+if(MPI_FOUND)
+  list(APPEND TEST_SOURCE_FILES tests/test_parallel_linearsolver.cpp
+                                tests/test_parallelistlinformation.cpp)
+endif()
+
 list (APPEND TEST_DATA_FILES
   tests/fluid.data
   tests/VFPPROD1
@@ -229,11 +232,14 @@ list (APPEND EXAMPLE_SOURCE_FILES
   examples/compute_tof_from_files.cpp
   examples/diagnose_relperm.cpp
   tutorials/sim_tutorial1.cpp
-  tutorials/sim_tutorial2.cpp
-  tutorials/sim_tutorial3.cpp
-  tutorials/sim_tutorial4.cpp
   )
 
+if(SuiteSparse_FOUND)
+  list(APPEND EXAMPLE_SOURCE_FILES tutorials/sim_tutorial2.cpp
+                                   tutorials/sim_tutorial3.cpp
+                                   tutorials/sim_tutorial4.cpp)
+endif()
+
 # programs listed here will not only be compiled, but also marked for
 # installation
 list (APPEND PROGRAM_SOURCE_FILES