More robust handling for installed headers

[alexxy/gromacs.git] / src / gromacs / utility / CMakeLists.txt

diff --git a/src/gromacs/utility/CMakeLists.txt b/src/gromacs/utility/CMakeLists.txt
index dc09af3c884a091e25fa4b959611fe3e7761174b..a478811e40c4c10e0cb3db4c00aa9da2e9090569 100644 (file)
--- a/src/gromacs/utility/CMakeLists.txt
+++ b/src/gromacs/utility/CMakeLists.txt
@@ -1,10 +1,10 @@
 #
 # This file is part of the GROMACS molecular simulation package.
 #
-# Copyright (c) 2010,2011,2012, by the GROMACS development team, led by
-# David van der Spoel, Berk Hess, Erik Lindahl, and including many
-# others, as listed in the AUTHORS file in the top-level source
-# directory and at http://www.gromacs.org.
+# Copyright (c) 2010,2011,2012,2013,2014, by the GROMACS development team, led by
+# Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
+# and including many others, as listed in the AUTHORS file in the
+# top-level source directory and at http://www.gromacs.org.
 #
 # GROMACS is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public License
@@ -32,33 +32,29 @@
 # To help us fund GROMACS development, we humbly ask that you cite
 # the research papers on the package. Check out http://www.gromacs.org.
 
-file(GLOB UTILITY_SOURCES *.cpp)
+file(GLOB UTILITY_SOURCES *.c *.cpp)
 set(LIBGROMACS_SOURCES ${LIBGROMACS_SOURCES} ${UTILITY_SOURCES} PARENT_SCOPE)
 
-set(GENERATED_HEADER_CONFIG ${CMAKE_CURRENT_BINARY_DIR}/gmx_header_config_gen.h)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/gmx_header_config_gen.h.cmakein
-               ${GENERATED_HEADER_CONFIG})
-
-set(UTILITY_PUBLIC_HEADERS
+gmx_install_headers(
     arrayref.h
+    basedefinitions.h
+    cstringutil.h
     common.h
     errorcodes.h
     exceptions.h
+    fatalerror.h
     file.h
     flags.h
+    futil.h
     gmx_header_config.h
     gmxassert.h
-    gmxmpi.h
-    programinfo.h
+    init.h
+    programcontext.h
+    real.h
+    smalloc.h
     stringutil.h
-    uniqueptr.h)
-install(FILES ${UTILITY_PUBLIC_HEADERS}
-        DESTINATION ${INCL_INSTALL_DIR}/gromacs/utility
-        COMPONENT development)
-install(FILES ${GENERATED_HEADER_CONFIG}
-        DESTINATION ${INCL_INSTALL_DIR}/gromacs/utility
-        COMPONENT development)
+    )
 
 if (BUILD_TESTING)
     add_subdirectory(tests)
-endif (BUILD_TESTING)
+endif()