Merge pull request #12 from rolk/012_cmakeupd

Update CMake scripts to commit f6d44238 from opm-core

.gitignore

@@ -1,31 +1,71 @@
+# use shell glob syntax for wildcards etc.
+# editor backup
 *~
+.\#*
+\#*\#
+.\#*\#
+
+# Eclipse project settings
+.cproject
+.project
+.settings/*
+
+# QtCreator project settings
+CMakeLists.txt.user*
+
+# compiler output
 *.o
 *.lo
 *.la
+*.a
+*.so
 .libs
 .deps
-*.pc
 stamp-*
-.dirstamp
+*.aux
+*.log
 
+# executables (test programs)
+bin/
+
+# configure artifacts
 Makefile
+config.h
+CMakeCache.txt
+CMakeFiles/
+CTestTestfile.cmake
+DartConfiguration.tcl
+Testing/
+*install.cmake
+*-config*.cmake
+*.pc
+install_manifest.txt
+
+# doxygen artifacts
+doc/doxygen/Doxyfile.in
+doc/doxygen/Doxyfile
+
+# Some more files generated by autotools.
 Makefile.in
-Doxyfile
-Doxyfile.in
 aclocal.m4
+am
 autom4te.cache
 config.*
 configure
-compile
-depcomp
 dependencies.m4
+depcomp
 install-sh
 libtool
 ltmain.sh
-m4/libtool.m4
-m4/lt*.m4
 missing
 
 # Ignoring executables
 *_test
-examples/hello
+examples/cpchop*
+examples/cpregularize
+examples/exp_variogram
+examples/upscale_*
+examples/grdecldips
+data
+steadystate_test_implicit
+steadystate_test_explicit

Makefile.am

@@ -1,35 +0,0 @@
-ACLOCAL_AMFLAGS = -I m4
-
-SUBDIRS = . examples
-
-
-# Declare libraries
-lib_LTLIBRARIES = libopmpolymer.la
-
-libopmpolymer_la_SOURCES =				\
-opm/polymer/CompressibleTpfaPolymer.cpp			\
-opm/polymer/IncompTpfaPolymer.cpp			\
-opm/polymer/PolymerInflow.cpp				\
-opm/polymer/PolymerProperties.cpp			\
-opm/polymer/SimulatorCompressiblePolymer.cpp		\
-opm/polymer/SimulatorPolymer.cpp			\
-opm/polymer/TransportModelCompressiblePolymer.cpp	\
-opm/polymer/TransportModelPolymer.cpp			\
-opm/polymer/polymerUtilities.cpp
-
-nobase_include_HEADERS =				\
-opm/polymer/CompressibleTpfaPolymer.hpp			\
-opm/polymer/GravityColumnSolverPolymer.hpp		\
-opm/polymer/GravityColumnSolverPolymer_impl.hpp		\
-opm/polymer/IncompPropertiesDefaultPolymer.hpp		\
-opm/polymer/IncompTpfaPolymer.hpp			\
-opm/polymer/PolymerBlackoilState.hpp			\
-opm/polymer/PolymerInflow.hpp				\
-opm/polymer/PolymerProperties.hpp			\
-opm/polymer/PolymerState.hpp				\
-opm/polymer/SimulatorCompressiblePolymer.hpp		\
-opm/polymer/SimulatorPolymer.hpp			\
-opm/polymer/SinglePointUpwindTwoPhasePolymer.hpp	\
-opm/polymer/TransportModelCompressiblePolymer.hpp	\
-opm/polymer/TransportModelPolymer.hpp			\
-opm/polymer/polymerUtilities.hpp

configure.ac

@@ -1,92 +0,0 @@
-#                                               -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
-
-AC_PREREQ([2.59])
-AC_INIT([OPM Polymer Module], [0.1], [atgeirr@sintef.no],dnl
-        [opmpolymer], [https://public.ict.sintef.no/opm/hg/opm-polymer])
-
-AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
-
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-m4_ifdef([LT_INIT], [LT_INIT])
-
-AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_SRCDIR([opm/polymer/TransportModelPolymer.hpp])
-AC_CONFIG_HEADERS([config.h])
-
-# Checks for programs.
-AC_PROG_CC
-AC_PROG_CXX
-AM_PROG_CC_C_O
-AC_PROG_RANLIB
-m4_ifdef([LT_INIT], [], [AC_PROG_LIBTOOL])
-
-# AX_LAPACK requires a working F77 compiler or, rather, its runtime
-# support libraries.
-AC_PROG_F77
-
-# F77 name mangling
-AC_F77_WRAPPERS
-
-# Checks for libraries.
-AC_SEARCH_LIBS([sqrt], [m])
-AC_CHECK_FUNCS([sqrt])
-
-AX_LAPACK
-AX_BOOST_BASE([1.37])
-AX_BOOST_SYSTEM
-AX_BOOST_DATE_TIME
-AX_BOOST_FILESYSTEM
-AX_BOOST_UNIT_TEST_FRAMEWORK
-
-ERT
-
-# Checks for header files.
-AC_CHECK_HEADERS([opm/core/grid.h], [],
-[AC_MSG_ERROR(
-  [cannot proceed without 'opm-core' header files.
-   *** Update CPPFLAGS and try again. ***])])
-
-AC_CHECK_HEADERS([suitesparse/umfpack.h],
-                 [umfpack_header=yes],
-                 [umfpack_header=no])
-
-
-# Checks for typedefs, structures, and compiler characteristics.
-
-# Checks for library functions.
-
-AC_F77_FUNC(dgetrf)
-AC_SEARCH_LIBS($dgemm, [blas])
-AC_SEARCH_LIBS($dgetrf, [lapack])
-
-AC_SEARCH_LIBS([amd_free],             [amd])
-AC_SEARCH_LIBS([camd_free],            [camd])
-AC_SEARCH_LIBS([colamd_set_defaults],  [colamd])
-AC_SEARCH_LIBS([ccolamd_set_defaults], [ccolamd])
-AC_SEARCH_LIBS([cholmod_l_start],      [cholmod])
-
-AC_SEARCH_LIBS([umfpack_dl_solve], [umfpack],
-               [umfpack_lib=yes], [umfpack_lib=no])
-
-AM_CONDITIONAL([UMFPACK],
-  [test "x$umfpack_header" != "xno" -a "x$umfpack_lib" != "xno"])
-
-m4_ifdef([AM_COND_IF],
-[AM_COND_IF([UMFPACK], [],
- [AC_MSG_NOTICE([Found no working installation of UMFPACK.
-                 UMFPACK support is disabled.])])
-])
-
-AC_SEARCH_LIBS([process_grdecl], [opmcore],
-               [opmcore_lib=yes],
-               [opmcore_lib=no],
-               [$BOOST_LDFLAGS $BOOST_SYSTEM_LIB
-                $LAPACK_LIBS $BLAS_LIBS $LIBS $FLIBS])
-
-AC_CONFIG_FILES([
-  Makefile
-  examples/Makefile
-])
-
-AC_OUTPUT

examples/Makefile.am

@@ -1,25 +0,0 @@
-AM_CPPFLAGS =					\
--I$(top_srcdir)					\
-$(BOOST_CPPFLAGS)
-
-LDFLAGS = $(BOOST_LDFLAGS)
-
-LDADD = $(top_builddir)/libopmpolymer.la	\
-$(BOOST_FILESYSTEM_LIB)				\
-$(BOOST_SYSTEM_LIB)	                        
-
-
-noinst_PROGRAMS =				\
-sim_poly2p_incomp_reorder                  	\
-sim_poly2p_comp_reorder                  	\
-test_singlecellsolves
-
-sim_poly2p_incomp_reorder_SOURCES =		\
-sim_poly2p_incomp_reorder.cpp
-
-sim_poly2p_comp_reorder_SOURCES =		\
-sim_poly2p_comp_reorder.cpp
-
-test_singlecellsolves_SOURCES =			\
-test_singlecellsolves.cpp
-