Merge pull request #1390 from akva2/super_build

Some changes to facilitate building using a super project

CMakeLists_files.cmake

@@ -158,7 +158,7 @@ list (APPEND TEST_SOURCE_FILES
   tests/test_parallel_linearsolver.cpp
   tests/test_satfunc.cpp
   tests/test_shadow.cpp
-  tests/test_equil.cpp
+  tests/test_equil_legacy.cpp
   tests/test_blackoilstate.cpp
   tests/test_wellsmanager.cpp
   tests/test_wellcontrols.cpp
@@ -224,10 +224,10 @@ list (APPEND EXAMPLE_SOURCE_FILES
   examples/compute_initial_state.cpp
   examples/compute_tof_from_files.cpp
   examples/diagnose_relperm.cpp
-  tutorials/tutorial1.cpp
-  tutorials/tutorial2.cpp
-  tutorials/tutorial3.cpp
-  tutorials/tutorial4.cpp
+  tutorials/sim_tutorial1.cpp
+  tutorials/sim_tutorial2.cpp
+  tutorials/sim_tutorial3.cpp
+  tutorials/sim_tutorial4.cpp
   )
 
 # programs listed here will not only be compiled, but also marked for

compareECLFiles.cmake

@@ -35,7 +35,7 @@ function(add_test_compareECLFiles)
   opm_add_test(${PARAM_PREFIX}_${PARAM_SIMULATOR}+${PARAM_FILENAME} NO_COMPILE
                EXE_NAME ${PARAM_SIMULATOR}
                DRIVER_ARGS ${OPM_DATA_ROOT}/${PARAM_DIR} ${RESULT_PATH}
-                           ${CMAKE_BINARY_DIR}/bin
+                           ${PROJECT_BINARY_DIR}/bin
                            ${PARAM_FILENAME}
                            ${PARAM_ABS_TOL} ${PARAM_REL_TOL}
                            ${COMPARE_SUMMARY_COMMAND}
@@ -64,7 +64,7 @@ function(add_test_compare_restarted_simulation)
   opm_add_test(compareRestartedSim_${PARAM_SIMULATOR}+${PARAM_FILENAME} NO_COMPILE
                EXE_NAME ${PARAM_SIMULATOR}
                DRIVER_ARGS ${OPM_DATA_ROOT}/${PARAM_CASENAME} ${RESULT_PATH}
-                           ${CMAKE_BINARY_DIR}/bin
+                           ${PROJECT_BINARY_DIR}/bin
                            ${PARAM_FILENAME}
                            ${PARAM_ABS_TOL} ${PARAM_REL_TOL}
                            ${COMPARE_SUMMARY_COMMAND}
@@ -95,7 +95,7 @@ function(add_test_compare_parallel_simulation)
   opm_add_test(compareParallelSim_${PARAM_SIMULATOR}+${PARAM_FILENAME} NO_COMPILE
                EXE_NAME ${PARAM_SIMULATOR}
                DRIVER_ARGS ${OPM_DATA_ROOT}/${PARAM_CASENAME} ${RESULT_PATH}
-                           ${CMAKE_BINARY_DIR}/bin
+                           ${PROJECT_BINARY_DIR}/bin
                            ${PARAM_FILENAME}
                            ${PARAM_ABS_TOL} ${PARAM_REL_TOL}
                            ${COMPARE_SUMMARY_COMMAND}