Added an option to easily compile contrib programs with cmake

Change-Id: Ib3fa2368c74c85bb733ba0d52e13e560134cfc5c

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e802e652df282e88f0f70f763f03b69a86fcce59..f07b127abce58c996aceb42598ab600e4040c53f 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -8,4 +8,5 @@ add_subdirectory(kernel)
 if(NOT GMX_FAHCORE)
   add_subdirectory(tools)
   add_subdirectory(ngmx)
+  add_subdirectory(contrib)
 endif(NOT GMX_FAHCORE)

diff --git a/src/contrib/CMakeLists.txt b/src/contrib/CMakeLists.txt
new file mode 100644 (file)
index 0000000..b43b007
--- /dev/null
+++ b/src/contrib/CMakeLists.txt
@@ -0,0 +1,8 @@
+set(CONTRIB_PROGRAMS 
+     #add here any programs you want to compile
+)
+
+foreach(PROG ${CONTRIB_PROGRAMS})
+        add_executable(${PROG} ${PROG}.c ${NGMX_COMMON_SOURCE})
+       set_target_properties(${PROG} PROPERTIES OUTPUT_NAME "${PROG}${GMX_BINARY_SUFFIX}")
+endforeach(PROG)

diff --git a/src/contrib/README b/src/contrib/README
index 7ce4ac39a8f30d946e1926a5f02485594a5528dc..b1b3e037e78721dd0bfac956de53f876a465c5ac 100644 (file)
--- a/src/contrib/README
+++ b/src/contrib/README
@@ -4,24 +4,7 @@ GROMACS developers and users. It is not really officially supported
 or documented, so if there are problems your best bet is probably
 either the mailing lists or to contact the author listed in the file.
 
-To add a program, you should edit Makefile.am. Have a look at 
-www.gromacs.org/developer if you are unfamiliar with automake/autoconf.
-Since gromacs uses both assembly, fortran, shared libraries and 
-dynamic dependency tracking on all platforms we rely on features in
-the prereleases of autoconf 1.5. Until this is released,
-you can get version 1.4j or later from ftp.gromacs.org/developer
-
-The EXTRA_PROGRAMS tag used here means they are not compiled and
-installed for the default package configuration setup.
-
-You should always be able to execute the program in this directory,
-but it is not installed automatically. Since we use libtool to handle
-shared/static libraries the "program file" you see is actually a libtool
-wrapper script, and if you move this script it will not work. To install
-e.g. "options" as "/usr/local/gromacs/i686-pc-linux-gnu/bin/options"
-you should give the command:
-
-../../libtool install options /usr/local/gromacs/i686-pc-linux-gnu/bin/options
+To add a program, you should edit CMakeLists.txt.