From 382b492ae08d6e47ede55f1a0319be9d99b7b67a Mon Sep 17 00:00:00 2001 From: Mark Abraham Date: Tue, 19 Dec 2017 18:25:06 +1100 Subject: [PATCH] Remove FindCUDA from source tarball When we decided to bundle FindCUDA.cmake and supporting files to keep our developer and Jenkins builds free of warnings, we did not take care to ensure that the user gets the behaviour from their cmake, since the combination of their cmake and its FindCUDA.cmake is much more likely to work correctly than their cmake and FindCUDA.cmake from cmake 3.4.3. The testing of the release tarball as part of the release workflow will ensure that we don't silently ship a broken CUDA build. Refs #2276 Change-Id: I9ed6fa97921eb5c3ce3b4a6ecc401b4dd26e1251 --- cmake/gmxCPackUtilities.cmake | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/cmake/gmxCPackUtilities.cmake b/cmake/gmxCPackUtilities.cmake index 7867998a8a..0388254c83 100644 --- a/cmake/gmxCPackUtilities.cmake +++ b/cmake/gmxCPackUtilities.cmake @@ -1,7 +1,7 @@ # # This file is part of the GROMACS molecular simulation package. # -# Copyright (c) 2014,2015,2016, by the GROMACS development team, led by +# Copyright (c) 2014,2015,2016,2017, 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. @@ -118,8 +118,16 @@ function (gmx_cpack_write_config) # Settings specific to source packages. set(CPACK_SOURCE_GENERATOR TGZ) set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}") - set(CPACK_SOURCE_IGNORE_FILES - "\\\\.isreposource$;\\\\.git/;\\\\.gitignore$;\\\\.gitattributes;INSTALL-dev;") + list(APPEND FILES_NOT_INCLUDED_IN_SOURCE_PACKAGE + \\\\.isreposource + \\\\.git + \\\\.gitignore + \\\\.gitattributes + INSTALL-dev + cmake/FindCUDA\\\\.cmake + cmake/FindCUDA) + set(CPACK_SOURCE_IGNORE_FILES ${FILES_NOT_INCLUDED_IN_SOURCE_PACKAGE}) + # Get the list of directories added with gmx_cpack_add_generated_source_directory() get_property(CPACK_SOURCE_INSTALLED_DIRECTORIES GLOBAL PROPERTY GMX_CPACK_SOURCE_INSTALLED_DIRECTORIES) -- 2.11.4.GIT