Move gmx_header_config under utility/.

Change-Id: Ib4cb6a578372ab8c509a0c1d804f193158b94273

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 78531297fd27adff574b54ef91cb12fed70db55d..658450404d9ac259de6a73425ac1cf0d0a8af8f9 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -536,7 +536,6 @@ include_directories(${CMAKE_SOURCE_DIR}/src)
 # Required for config.h, maybe should only be set in src/CMakeLists.txt
 include_directories(${CMAKE_BINARY_DIR}/src)
 # Required for now to make old code compile
-include_directories(${CMAKE_BINARY_DIR}/src/gromacs/legacyheaders)
 include_directories(${CMAKE_SOURCE_DIR}/src/gromacs/legacyheaders)
 
 include(gmxCheckBuildUserTime)

diff --git a/src/gromacs/gmxlib/checkpoint.c b/src/gromacs/gmxlib/checkpoint.c
index 09b14677804a005f9b1e80a4fa340f4b9d82c9f0..ae1c1e4a6e8366d5b86dc4db9651ce52497c19b6 100644 (file)
--- a/src/gromacs/gmxlib/checkpoint.c
+++ b/src/gromacs/gmxlib/checkpoint.c
@@ -23,7 +23,7 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include "gmx_header_config.h"
+#include "gromacs/utility/gmx_header_config.h"
 
 #include <string.h>
 #include <time.h>

diff --git a/src/gromacs/gmxlib/futil.c b/src/gromacs/gmxlib/futil.c
index ea18883db312ac29ad1134c3633ea6c592d9a0d9..815ab675d6c89ec18e809527ab076e30c009ba57 100644 (file)
--- a/src/gromacs/gmxlib/futil.c
+++ b/src/gromacs/gmxlib/futil.c
@@ -36,7 +36,7 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include "gmx_header_config.h"
+#include "gromacs/utility/gmx_header_config.h"
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/src/gromacs/gmxlib/gmx_random.c b/src/gromacs/gmxlib/gmx_random.c
index 0e560998068d674421acdbd7766c94068de416a1..76b26c3fd7a595070b66551fc2d84e8b5aba8b63 100644 (file)
--- a/src/gromacs/gmxlib/gmx_random.c
+++ b/src/gromacs/gmxlib/gmx_random.c
@@ -35,7 +35,7 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include "gmx_header_config.h"
+#include "gromacs/utility/gmx_header_config.h"
 
 #include <gmx_random.h>
 

diff --git a/src/gromacs/gmxlib/main.c b/src/gromacs/gmxlib/main.c
index 10ce861d78f656d9157f5ca71f28689522e1e7e5..80f81a5ac8376e982c9613f2cc5c01698a27dd4d 100644 (file)
--- a/src/gromacs/gmxlib/main.c
+++ b/src/gromacs/gmxlib/main.c
@@ -36,7 +36,7 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include "gmx_header_config.h"
+#include "gromacs/utility/gmx_header_config.h"
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/src/gromacs/gmxlib/rando.c b/src/gromacs/gmxlib/rando.c
index e3c9e343070d1f49a52c7d7c035e50a2f4c22756..cf6e741ef51e5c2942d0a9eb7ace225b32f3cb5a 100644 (file)
--- a/src/gromacs/gmxlib/rando.c
+++ b/src/gromacs/gmxlib/rando.c
@@ -35,7 +35,7 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include "gmx_header_config.h"
+#include "gromacs/utility/gmx_header_config.h"
 
 #include <time.h>
 #ifdef GMX_NATIVE_WINDOWS

diff --git a/src/gromacs/gmxlib/string2.c b/src/gromacs/gmxlib/string2.c
index e9bb7b723920a4d092edbd95630ddbb69b81689d..9048a2a6737f2f167b97f0033896a86688d1a940 100644 (file)
--- a/src/gromacs/gmxlib/string2.c
+++ b/src/gromacs/gmxlib/string2.c
@@ -36,7 +36,7 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include "gmx_header_config.h"
+#include "gromacs/utility/gmx_header_config.h"
 
 #ifdef GMX_CRAY_XT3
 #undef HAVE_PWD_H

diff --git a/src/gromacs/gmxlib/vmdio.c b/src/gromacs/gmxlib/vmdio.c
index 9dad9e0f5a7b20538a0c7debde08a3478ac81a72..23cbf6da5cf8297e377fce40d7948c9e737914aa 100644 (file)
--- a/src/gromacs/gmxlib/vmdio.c
+++ b/src/gromacs/gmxlib/vmdio.c
@@ -18,7 +18,7 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include "gmx_header_config.h"
+#include "gromacs/utility/gmx_header_config.h"
 
 
 

diff --git a/src/gromacs/gmxlib/wman.c b/src/gromacs/gmxlib/wman.c
index 9d9bd887eb2039c1e050ba39076a5d3db96c0205..db41951edf6bf8d20bc79ed3e1f4d51cf9187060 100644 (file)
--- a/src/gromacs/gmxlib/wman.c
+++ b/src/gromacs/gmxlib/wman.c
@@ -35,7 +35,7 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include "gmx_header_config.h"
+#include "gromacs/utility/gmx_header_config.h"
 
 #include "string2.h"
 #include "smalloc.h"

diff --git a/src/gromacs/legacyheaders/CMakeLists.txt b/src/gromacs/legacyheaders/CMakeLists.txt
index 397bff235ce6d0343c7d8b9415e7f495f502819a..b032b87a24993def0408f300d052f0220dafcd61 100644 (file)
--- a/src/gromacs/legacyheaders/CMakeLists.txt
+++ b/src/gromacs/legacyheaders/CMakeLists.txt
@@ -1,10 +1,4 @@
-# includes: Nothing to build, just configuration and installation
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/gmx_header_config.h.cmakein ${CMAKE_CURRENT_BINARY_DIR}/gmx_header_config.h)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/gmx_header_config.h
-  DESTINATION ${INCL_INSTALL_DIR}/gromacs/legacyheaders
-  COMPONENT development
-)
-
+# includes: Nothing to build, just installation
 install(DIRECTORY . DESTINATION ${INCL_INSTALL_DIR}/gromacs/legacyheaders
   COMPONENT development
   PATTERN "Makefile*" EXCLUDE

diff --git a/src/gromacs/legacyheaders/futil.h b/src/gromacs/legacyheaders/futil.h
index 507d0416889555c2c87eac4776c7de4660629fc1..62cfb52ac415414d696f0a7af4a94bde5a29193e 100644 (file)
--- a/src/gromacs/legacyheaders/futil.h
+++ b/src/gromacs/legacyheaders/futil.h
@@ -51,7 +51,7 @@ extern "C" {
  * When reading the PATH environment variable, Unix separates entries
  * with colon, while windows uses semicolon.
  */
-#include "gmx_header_config.h"
+#include "../utility/gmx_header_config.h"
 #ifdef GMX_NATIVE_WINDOWS
 #define DIR_SEPARATOR '\\'
 #define PATH_SEPARATOR ";"

diff --git a/src/gromacs/legacyheaders/string2.h b/src/gromacs/legacyheaders/string2.h
index d0daa32882da0e90fe7974e7aaa0cc78cb6dad4a..a422a5823c18dea2be1b86358a15dd37e20f66e6 100644 (file)
--- a/src/gromacs/legacyheaders/string2.h
+++ b/src/gromacs/legacyheaders/string2.h
@@ -52,7 +52,7 @@
 #include <ctype.h>
 #include <time.h>
 #include <errno.h>
-#include "gmx_header_config.h"
+#include "../utility/gmx_header_config.h"
 
 /*#include "typedefs.h"*/
 #include "types/simple.h"

diff --git a/src/gromacs/legacyheaders/xdrf.h b/src/gromacs/legacyheaders/xdrf.h
index ba3ac55893173afb52579db754a20de74e385f0c..fa874a634c93313c25f4f58d59ec5349b0df4b44 100644 (file)
--- a/src/gromacs/legacyheaders/xdrf.h
+++ b/src/gromacs/legacyheaders/xdrf.h
@@ -44,7 +44,7 @@
 #define int64_t long long
 #endif
 
-#include "gmx_header_config.h"
+#include "../utility/gmx_header_config.h"
 #if (defined GMX_NATIVE_WINDOWS || defined GMX_CYGWIN || defined GMX_INTERNAL_XDR)
 #include "gmx_system_xdr.h"
 #else

diff --git a/src/gromacs/utility/.gitignore b/src/gromacs/utility/.gitignore
new file mode 100644 (file)
index 0000000..c1a7f0d
--- /dev/null
+++ b/src/gromacs/utility/.gitignore
@@ -0,0 +1 @@
+gmx_header_config.h

diff --git a/src/gromacs/utility/CMakeLists.txt b/src/gromacs/utility/CMakeLists.txt
index aae75dca8d72d5785edc11e2844f58a3471ea930..8dcbde67289773f2f01854d1d1edd93143e3cd53 100644 (file)
--- a/src/gromacs/utility/CMakeLists.txt
+++ b/src/gromacs/utility/CMakeLists.txt
@@ -1,6 +1,11 @@
 file(GLOB UTILITY_SOURCES *.cpp)
 set(LIBGROMACS_SOURCES ${LIBGROMACS_SOURCES} ${UTILITY_SOURCES} PARENT_SCOPE)
 
+# Needs to be created in the source tree to allow relative paths in headers to
+# be resolved correctly before installation
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/gmx_header_config.h.cmakein
+               ${CMAKE_CURRENT_SOURCE_DIR}/gmx_header_config.h)
+
 set(UTILITY_PUBLIC_HEADERS
     arrayref.h
     common.h
@@ -9,6 +14,7 @@ set(UTILITY_PUBLIC_HEADERS
     file.h
     flags.h
     format.h
+    gmx_header_config.h
     gmxassert.h
     uniqueptr.h)
 install(FILES ${UTILITY_PUBLIC_HEADERS}

diff --git a/src/gromacs/legacyheaders/gmx_header_config.h.cmakein b/src/gromacs/utility/gmx_header_config.h.cmakein
similarity index 100%
rename from src/gromacs/legacyheaders/gmx_header_config.h.cmakein
rename to src/gromacs/utility/gmx_header_config.h.cmakein

diff --git a/src/tools/gmx_trjconv.c b/src/tools/gmx_trjconv.c
index a71aa02e15ac29ddadc1a1d31e3e635123754580..37619c8cd4af8585ce277628f5aa868ffd56644c 100644 (file)
--- a/src/tools/gmx_trjconv.c
+++ b/src/tools/gmx_trjconv.c
@@ -35,7 +35,7 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include "gmx_header_config.h"
+#include "gromacs/utility/gmx_header_config.h"
 
 #include <string.h>
 #include <math.h>