Fixed issues with header installation.

Header installation for the new C++ modules should now more or less
work.  Updated the lists of headers to be installed in CMakeLists.txt
files, and updated the #include statements in the installed headers to
use relative paths.

diff --git a/src/gromacs/analysisdata.h b/src/gromacs/analysisdata.h
index f837d8272ae9d0cf2064b17a90c418f2bced935d..0af48c628c9d991ecfa5c4e6a90d7b622ab1bed8 100644 (file)
--- a/src/gromacs/analysisdata.h
+++ b/src/gromacs/analysisdata.h
@@ -52,5 +52,6 @@
 #include "analysisdata/modules/average.h"
 #include "analysisdata/modules/displacement.h"
 #include "analysisdata/modules/histogram.h"
+#include "analysisdata/modules/plot.h"
 
 #endif

diff --git a/src/gromacs/analysisdata/CMakeLists.txt b/src/gromacs/analysisdata/CMakeLists.txt
index ad4997f95111b48b50636df6f793153d00d9603c..fd0aad05eb0996c3f0839c2b5b891fbcbff26094 100644 (file)
--- a/src/gromacs/analysisdata/CMakeLists.txt
+++ b/src/gromacs/analysisdata/CMakeLists.txt
@@ -1,2 +1,13 @@
 file(GLOB ANALYSISDATA_SOURCES *.cpp modules/*.cpp)
 set(LIBGROMACS_SOURCES ${LIBGROMACS_SOURCES} ${ANALYSISDATA_SOURCES} PARENT_SCOPE)
+
+set(ANALYSISDATA_PUBLIC_HEADERS
+    abstractdata.h
+    analysisdata.h
+    arraydata.h
+    datamodule.h)
+install(FILES ${ANALYSISDATA_PUBLIC_HEADERS}
+        DESTINATION ${INCL_INSTALL_DIR}/gromacs/analysisdata
+        COMPONENT development)
+
+add_subdirectory(modules)

diff --git a/src/gromacs/analysisdata/abstractdata.h b/src/gromacs/analysisdata/abstractdata.h
index 6693569515e7563d43b9596d529a848eaabd04af..25942c8ad85c3fe1571cb9ae393b9091c6e32374 100644 (file)
--- a/src/gromacs/analysisdata/abstractdata.h
+++ b/src/gromacs/analysisdata/abstractdata.h
@@ -39,7 +39,7 @@
 #ifndef GMX_ANALYSISDATA_ABSTRACTDATA_H
 #define GMX_ANALYSISDATA_ABSTRACTDATA_H
 
-#include "types/simple.h"
+#include "../legacyheaders/types/simple.h"
 
 namespace gmx
 {

diff --git a/src/gromacs/analysisdata/datamodule.h b/src/gromacs/analysisdata/datamodule.h
index 1a57f843bc62a17a18648ce45b901d6cf38cae6e..93dbd9ed646cf2a77d64cc55d813a59899219a1b 100644 (file)
--- a/src/gromacs/analysisdata/datamodule.h
+++ b/src/gromacs/analysisdata/datamodule.h
@@ -39,7 +39,7 @@
 #ifndef GMX_ANALYSISDATA_DATAMODULE_H
 #define GMX_ANALYSISDATA_DATAMODULE_H
 
-#include "types/simple.h"
+#include "../legacyheaders/types/simple.h"
 
 namespace gmx
 {

diff --git a/src/gromacs/analysisdata/modules/CMakeLists.txt b/src/gromacs/analysisdata/modules/CMakeLists.txt
new file mode 100644 (file)
index 0000000..61b3e75
--- /dev/null
+++ b/src/gromacs/analysisdata/modules/CMakeLists.txt
@@ -0,0 +1,8 @@
+set(ANALYSISDATA_MODULES_PUBLIC_HEADERS
+    average.h
+    displacement.h
+    histogram.h
+    plot.h)
+install(FILES ${ANALYSISDATA_MODULES_PUBLIC_HEADERS}
+        DESTINATION ${INCL_INSTALL_DIR}/gromacs/analysisdata/modules
+        COMPONENT development)

diff --git a/src/gromacs/selection/CMakeLists.txt b/src/gromacs/selection/CMakeLists.txt
index 9bf9cf888374dd82a1347b3ca2503ae44a2d4f57..b7df5bca6c665d3a32ecb6df8b4770aaf1573a12 100644 (file)
--- a/src/gromacs/selection/CMakeLists.txt
+++ b/src/gromacs/selection/CMakeLists.txt
@@ -3,11 +3,13 @@ set(LIBGROMACS_SOURCES ${LIBGROMACS_SOURCES} ${SELECTION_SOURCES} PARENT_SCOPE)
 
 set(SELECTION_PUBLIC_HEADERS
     centerofmass.h
-    indexutil.h
     nbsearch.h
     poscalc.h
+    indexutil.h
     position.h
     selection.h
+    selectionenums.h
+    selectionoption.h
     selparam.h
     selmethod.h
     selvalue.h)

diff --git a/src/gromacs/trajectoryanalysis/CMakeLists.txt b/src/gromacs/trajectoryanalysis/CMakeLists.txt
index c865ecf58cb41d6a81b1df047efbd7b8d1b31cde..726ceb825494ef94793819be7f36b7f5b72de39d 100644 (file)
--- a/src/gromacs/trajectoryanalysis/CMakeLists.txt
+++ b/src/gromacs/trajectoryanalysis/CMakeLists.txt
@@ -1,6 +1,14 @@
 file(GLOB TRAJECTORYANALYSIS_SOURCES *.cpp modules/*.cpp)
 set(LIBGROMACS_SOURCES ${LIBGROMACS_SOURCES} ${TRAJECTORYANALYSIS_SOURCES} PARENT_SCOPE)
 
+set(TRAJECTORYANALYSIS_PUBLIC_HEADERS
+    analysismodule.h
+    analysissettings.h
+    cmdlinerunner.h)
+install(FILES ${TRAJECTORYANALYSIS_PUBLIC_HEADERS}
+        DESTINATION ${INCL_INSTALL_DIR}/gromacs/trajectoryanalysis
+        COMPONENT development)
+
 if (BUILD_TESTING)
     add_subdirectory(tests)
 endif (BUILD_TESTING)

diff --git a/src/gromacs/trajectoryanalysis/analysismodule.h b/src/gromacs/trajectoryanalysis/analysismodule.h
index 2239dabef2158b847dbc0953d0c41ef15aab8edd..f5a3667f221907d0bb88b8f844734e6f9ca8d65b 100644 (file)
--- a/src/gromacs/trajectoryanalysis/analysismodule.h
+++ b/src/gromacs/trajectoryanalysis/analysismodule.h
@@ -38,7 +38,7 @@
 #include <string>
 #include <vector>
 
-#include <typedefs.h>
+#include "../legacyheaders/typedefs.h"
 
 namespace gmx
 {

diff --git a/src/gromacs/trajectoryanalysis/analysissettings.h b/src/gromacs/trajectoryanalysis/analysissettings.h
index 9d4b666eff3c0d5ec1b9b737fb7b332d83c38510..97c6c2d94476b2df5dca5260bb3d1e95db98d33a 100644 (file)
--- a/src/gromacs/trajectoryanalysis/analysissettings.h
+++ b/src/gromacs/trajectoryanalysis/analysissettings.h
@@ -35,7 +35,7 @@
 #ifndef GMX_TRAJECTORYANALYSIS_ANALYSISSETTINGS_H
 #define GMX_TRAJECTORYANALYSIS_ANALYSISSETTINGS_H
 
-#include <typedefs.h>
+#include "../legacyheaders/typedefs.h"
 
 namespace gmx
 {

diff --git a/src/gromacs/utility/CMakeLists.txt b/src/gromacs/utility/CMakeLists.txt
new file mode 100644 (file)
index 0000000..530d78b
--- /dev/null
+++ b/src/gromacs/utility/CMakeLists.txt
@@ -0,0 +1,5 @@
+set(UTILITY_PUBLIC_HEADERS
+    flags.h)
+install(FILES ${UTILITY_PUBLIC_HEADERS}
+        DESTINATION ${INCL_INSTALL_DIR}/gromacs/utility
+        COMPONENT development)