From e0c85a2fdb6761599753af02430cbd9945ba76a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?B=C3=A5rd=20Skaflestad?= <Bard.Skaflestad@sintef.no>
Date: Wed, 15 May 2013 16:10:20 +0200
Subject: [PATCH] Adapt to CMake-based build system.

Specifically,

  - #include <config.h> where appropriate (all .cpp files)
  - Adjust include statements to account for sub-directory locations
    of .hpp files.
---
 examples/find_zero.cpp                       | 4 +++-
 examples/sim_2p_incomp_adfi.cpp              | 2 +-
 examples/sim_simple.cpp                      | 6 ++++--
 opm/autodiff/AutoDiffBlock.hpp               | 2 +-
 opm/autodiff/AutoDiffHelpers.hpp             | 2 +-
 opm/autodiff/AutoDiffVec.hpp                 | 2 +-
 opm/autodiff/BlackoilPropsAd.cpp             | 6 ++++--
 opm/autodiff/BlackoilPropsAd.hpp             | 2 +-
 opm/autodiff/ImpesTPFAAD.hpp                 | 4 ++--
 opm/autodiff/SimulatorIncompTwophaseAdfi.cpp | 4 ++--
 opm/autodiff/TransportSolverTwophaseAd.cpp   | 4 +++-
 opm/autodiff/TransportSolverTwophaseAd.hpp   | 4 ++--
 tests/not-unit/test_ad.cpp                   | 4 +++-
 tests/not-unit/test_impestpfa_ad.cpp         | 4 +++-
 tests/not-unit/test_vec.cpp                  | 4 +++-
 tests/test_block.cpp                         | 4 +++-
 tests/test_boprops_ad.cpp                    | 4 +++-
 tests/test_syntax.cpp                        | 4 +++-
 18 files changed, 43 insertions(+), 23 deletions(-)

diff --git a/examples/find_zero.cpp b/examples/find_zero.cpp
index e428c5ebf..1e56c0a16 100644
--- a/examples/find_zero.cpp
+++ b/examples/find_zero.cpp
@@ -33,7 +33,9 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "AutoDiff.hpp"
+#include <config.h>
+
+#include <opm/autodiff/AutoDiff.hpp>
 
 #include <iostream>
 #include <cmath>
diff --git a/examples/sim_2p_incomp_adfi.cpp b/examples/sim_2p_incomp_adfi.cpp
index 982b405a5..3e0025245 100644
--- a/examples/sim_2p_incomp_adfi.cpp
+++ b/examples/sim_2p_incomp_adfi.cpp
@@ -44,7 +44,7 @@
 
 #include <opm/core/simulator/TwophaseState.hpp>
 #include <opm/core/simulator/WellState.hpp>
-#include "SimulatorIncompTwophaseAdfi.hpp"
+#include <opm/autodiff/SimulatorIncompTwophaseAdfi.hpp>
 
 #include <boost/scoped_ptr.hpp>
 #include <boost/filesystem.hpp>
diff --git a/examples/sim_simple.cpp b/examples/sim_simple.cpp
index 9cd59daaf..91e153f52 100644
--- a/examples/sim_simple.cpp
+++ b/examples/sim_simple.cpp
@@ -17,8 +17,10 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "AutoDiffBlock.hpp"
-#include "AutoDiffHelpers.hpp"
+#include <config.h>
+
+#include <opm/autodiff/AutoDiffBlock.hpp>
+#include <opm/autodiff/AutoDiffHelpers.hpp>
 #include <opm/core/grid.h>
 #include <opm/core/grid/GridManager.hpp>
 #include <opm/core/props/IncompPropertiesBasic.hpp>
diff --git a/opm/autodiff/AutoDiffBlock.hpp b/opm/autodiff/AutoDiffBlock.hpp
index 18641b664..2972d5fca 100644
--- a/opm/autodiff/AutoDiffBlock.hpp
+++ b/opm/autodiff/AutoDiffBlock.hpp
@@ -20,7 +20,7 @@
 #ifndef OPM_AUTODIFFBLOCK_HEADER_INCLUDED
 #define OPM_AUTODIFFBLOCK_HEADER_INCLUDED
 
-#include "AutoDiff.hpp"
+#include <opm/autodiff/AutoDiff.hpp>
 #include <Eigen/Eigen>
 #include <Eigen/Sparse>
 #include <vector>
diff --git a/opm/autodiff/AutoDiffHelpers.hpp b/opm/autodiff/AutoDiffHelpers.hpp
index 740e8b8ba..c3dbd8d3a 100644
--- a/opm/autodiff/AutoDiffHelpers.hpp
+++ b/opm/autodiff/AutoDiffHelpers.hpp
@@ -20,7 +20,7 @@
 #ifndef OPM_AUTODIFFHELPERS_HEADER_INCLUDED
 #define OPM_AUTODIFFHELPERS_HEADER_INCLUDED
 
-#include "AutoDiffBlock.hpp"
+#include <opm/autodiff/AutoDiffBlock.hpp>
 #include <opm/core/grid.h>
 
 
diff --git a/opm/autodiff/AutoDiffVec.hpp b/opm/autodiff/AutoDiffVec.hpp
index 5996e0284..feb593eec 100644
--- a/opm/autodiff/AutoDiffVec.hpp
+++ b/opm/autodiff/AutoDiffVec.hpp
@@ -20,7 +20,7 @@
 #ifndef OPM_AUTODIFFVEC_HEADER_INCLUDED
 #define OPM_AUTODIFFVEC_HEADER_INCLUDED
 
-#include "AutoDiff.hpp"
+#include <opm/autodiff/AutoDiff.hpp>
 #include <Eigen/Eigen>
 #include <Eigen/Sparse>
 
diff --git a/opm/autodiff/BlackoilPropsAd.cpp b/opm/autodiff/BlackoilPropsAd.cpp
index db5436f0d..48b0515da 100644
--- a/opm/autodiff/BlackoilPropsAd.cpp
+++ b/opm/autodiff/BlackoilPropsAd.cpp
@@ -17,8 +17,10 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "BlackoilPropsAd.hpp"
-#include "AutoDiffHelpers.hpp"
+#include <config.h>
+
+#include <opm/autodiff/BlackoilPropsAd.hpp>
+#include <opm/autodiff/AutoDiffHelpers.hpp>
 #include <opm/core/props/BlackoilPropertiesInterface.hpp>
 #include <opm/core/props/BlackoilPhases.hpp>
 #include <opm/core/utility/ErrorMacros.hpp>
diff --git a/opm/autodiff/BlackoilPropsAd.hpp b/opm/autodiff/BlackoilPropsAd.hpp
index 358dd6fb2..a672f48d1 100644
--- a/opm/autodiff/BlackoilPropsAd.hpp
+++ b/opm/autodiff/BlackoilPropsAd.hpp
@@ -20,7 +20,7 @@
 #ifndef OPM_BLACKOILPROPSAD_HEADER_INCLUDED
 #define OPM_BLACKOILPROPSAD_HEADER_INCLUDED
 
-#include "AutoDiffBlock.hpp"
+#include <opm/autodiff/AutoDiffBlock.hpp>
 #include <opm/core/props/BlackoilPhases.hpp>
 
 namespace Opm
diff --git a/opm/autodiff/ImpesTPFAAD.hpp b/opm/autodiff/ImpesTPFAAD.hpp
index 08922d5ec..643433ed3 100644
--- a/opm/autodiff/ImpesTPFAAD.hpp
+++ b/opm/autodiff/ImpesTPFAAD.hpp
@@ -21,8 +21,8 @@
 #ifndef OPM_IMPESTPFAAD_HEADER_INCLUDED
 #define OPM_IMPESTPFAAD_HEADER_INCLUDED
 
-#include "AutoDiffBlock.hpp"
-#include "AutoDiffHelpers.hpp"
+#include <opm/autodiff/AutoDiffBlock.hpp>
+#include <opm/autodiff/AutoDiffHelpers.hpp>
 
 #include <opm/core/simulator/BlackoilState.hpp>
 #include <opm/core/simulator/WellState.hpp>
diff --git a/opm/autodiff/SimulatorIncompTwophaseAdfi.cpp b/opm/autodiff/SimulatorIncompTwophaseAdfi.cpp
index d34bd2a08..ff45b8206 100644
--- a/opm/autodiff/SimulatorIncompTwophaseAdfi.cpp
+++ b/opm/autodiff/SimulatorIncompTwophaseAdfi.cpp
@@ -22,7 +22,7 @@
 #include "config.h"
 #endif // HAVE_CONFIG_H
 
-#include "SimulatorIncompTwophaseAdfi.hpp"
+#include <opm/autodiff/SimulatorIncompTwophaseAdfi.hpp>
 #include <opm/core/utility/parameters/ParameterGroup.hpp>
 #include <opm/core/utility/ErrorMacros.hpp>
 
@@ -47,7 +47,7 @@
 #include <opm/core/simulator/WellState.hpp>
 #include <opm/core/transport/reorder/TransportSolverTwophaseReorder.hpp>
 #include <opm/core/transport/implicit/TransportSolverTwophaseImplicit.hpp>
-#include "TransportSolverTwophaseAd.hpp"
+#include <opm/autodiff/TransportSolverTwophaseAd.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/scoped_ptr.hpp>
 #include <boost/lexical_cast.hpp>
diff --git a/opm/autodiff/TransportSolverTwophaseAd.cpp b/opm/autodiff/TransportSolverTwophaseAd.cpp
index db1521e3c..af82a8202 100644
--- a/opm/autodiff/TransportSolverTwophaseAd.cpp
+++ b/opm/autodiff/TransportSolverTwophaseAd.cpp
@@ -17,7 +17,9 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "TransportSolverTwophaseAd.hpp"
+#include <config.h>
+
+#include <opm/autodiff/TransportSolverTwophaseAd.hpp>
 #include <opm/core/grid.h>
 #include <opm/core/linalg/LinearSolverInterface.hpp>
 #include <opm/core/pressure/tpfa/trans_tpfa.h>
diff --git a/opm/autodiff/TransportSolverTwophaseAd.hpp b/opm/autodiff/TransportSolverTwophaseAd.hpp
index 6d7999066..8468c9329 100644
--- a/opm/autodiff/TransportSolverTwophaseAd.hpp
+++ b/opm/autodiff/TransportSolverTwophaseAd.hpp
@@ -20,8 +20,8 @@
 #ifndef OPM_TRANSPORTSOLVERTWOPHASEAD_HEADER_INCLUDED
 #define OPM_TRANSPORTSOLVERTWOPHASEAD_HEADER_INCLUDED
 
-#include "AutoDiffBlock.hpp"
-#include "AutoDiffHelpers.hpp"
+#include <opm/autodiff/AutoDiffBlock.hpp>
+#include <opm/autodiff/AutoDiffHelpers.hpp>
 #include <opm/core/transport/TransportSolverTwophaseInterface.hpp>
 #include <vector>
 
diff --git a/tests/not-unit/test_ad.cpp b/tests/not-unit/test_ad.cpp
index 06f97505e..d16c7a146 100644
--- a/tests/not-unit/test_ad.cpp
+++ b/tests/not-unit/test_ad.cpp
@@ -33,7 +33,9 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "AutoDiff.hpp"
+#include <config.h>
+
+#include <opm/autodiff/AutoDiff.hpp>
 
 #include <iostream>
 
diff --git a/tests/not-unit/test_impestpfa_ad.cpp b/tests/not-unit/test_impestpfa_ad.cpp
index 2344dfc0a..1b15a0e1a 100644
--- a/tests/not-unit/test_impestpfa_ad.cpp
+++ b/tests/not-unit/test_impestpfa_ad.cpp
@@ -18,7 +18,9 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "ImpesTPFAAD.hpp"
+#include <config.h>
+
+#include <opm/autodiff/ImpesTPFAAD.hpp>
 
 #include <opm/core/grid.h>
 #include <opm/core/grid/GridManager.hpp>
diff --git a/tests/not-unit/test_vec.cpp b/tests/not-unit/test_vec.cpp
index 1da234ac1..aa5704c12 100644
--- a/tests/not-unit/test_vec.cpp
+++ b/tests/not-unit/test_vec.cpp
@@ -17,7 +17,9 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "AutoDiffVec.hpp"
+#include <config.h>
+
+#include <opm/autodiff/AutoDiffVec.hpp>
 #include <iostream>
 
 int main()
diff --git a/tests/test_block.cpp b/tests/test_block.cpp
index 4a7a9f56a..4fd532637 100644
--- a/tests/test_block.cpp
+++ b/tests/test_block.cpp
@@ -17,13 +17,15 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <config.h>
+
 #if HAVE_DYNAMIC_BOOST_TEST
 #define BOOST_TEST_DYN_LINK
 #endif
 
 #define BOOST_TEST_MODULE AutoDiffBlockTest
 
-#include "AutoDiffBlock.hpp"
+#include <opm/autodiff/AutoDiffBlock.hpp>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/tests/test_boprops_ad.cpp b/tests/test_boprops_ad.cpp
index 428db1f05..0b5c5a4e8 100644
--- a/tests/test_boprops_ad.cpp
+++ b/tests/test_boprops_ad.cpp
@@ -18,13 +18,15 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <config.h>
+
 #if HAVE_DYNAMIC_BOOST_TEST
 #define BOOST_TEST_DYN_LINK
 #endif
 
 #define BOOST_TEST_MODULE FluidPropertiesTest
 
-#include "BlackoilPropsAd.hpp"
+#include <opm/autodiff/BlackoilPropsAd.hpp>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/tests/test_syntax.cpp b/tests/test_syntax.cpp
index 7886677f9..17e12ae91 100644
--- a/tests/test_syntax.cpp
+++ b/tests/test_syntax.cpp
@@ -1,10 +1,12 @@
+#include <config.h>
+
 #if HAVE_DYNAMIC_BOOST_TEST
 #define BOOST_TEST_DYN_LINK
 #endif
 
 #define BOOST_TEST_MODULE SyntaxTest
 
-#include "AutoDiff.hpp"
+#include <opm/autodiff/AutoDiff.hpp>
 
 #include <cmath>
 #include <boost/test/unit_test.hpp>