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

@@ -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>

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>

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>

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>

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>
 
 

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>
 

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>

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

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>

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>

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>

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>
 

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>
 

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>

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()

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>
 

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>
 

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>