From 545d96128c2bff5320ac7b38ae057d7147a5843b Mon Sep 17 00:00:00 2001 From: "Marcus D. Hanwell" Date: Wed, 31 Jan 2018 10:33:56 -0500 Subject: [PATCH 1/3] Bump version --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5e96d5d..ca115c0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,7 +21,7 @@ include(DetermineVersion) # Set up our version. set(MoleQueue_VERSION_MAJOR "0") -set(MoleQueue_VERSION_MINOR "8") +set(MoleQueue_VERSION_MINOR "9") set(MoleQueue_VERSION_PATCH "0") set(MoleQueue_VERSION "${MoleQueue_VERSION_MAJOR}.${MoleQueue_VERSION_MINOR}.${MoleQueue_VERSION_PATCH}") From debe83b23a687b63cb9de1e63aa55b7abbd55dc8 Mon Sep 17 00:00:00 2001 From: "Marcus D. Hanwell" Date: Wed, 31 Jan 2018 10:34:08 -0500 Subject: [PATCH 2/3] Update copyright years --- COPYING | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/COPYING b/COPYING index 2ac0e18..fe99868 100644 --- a/COPYING +++ b/COPYING @@ -1,4 +1,4 @@ -Copyright (c) 2011-2013, Kitware, Inc. +Copyright (c) 2011-2018, Kitware, Inc. All rights reserved. Redistribution and use in source and binary forms, with or without From a240614369e809e581f963aa8e4aad71b2d4870e Mon Sep 17 00:00:00 2001 From: "Marcus D. Hanwell" Date: Wed, 31 Jan 2018 10:35:43 -0500 Subject: [PATCH 3/3] Move the COPYING file to LICENSE --- CMakeLists.txt | 2 +- COPYING => LICENSE | 0 cmake/MoleQueueCPack.cmake | 8 ++++---- 3 files changed, 5 insertions(+), 5 deletions(-) rename COPYING => LICENSE (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index ca115c0..175557b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -96,7 +96,7 @@ install( FILES README.md CONTRIBUTING.md - COPYING + LICENSE DESTINATION "${INSTALL_DOC_DIR}/molequeue") include(MoleQueueCPack) diff --git a/COPYING b/LICENSE similarity index 100% rename from COPYING rename to LICENSE diff --git a/cmake/MoleQueueCPack.cmake b/cmake/MoleQueueCPack.cmake index 8bb0dc5..4c519fb 100644 --- a/cmake/MoleQueueCPack.cmake +++ b/cmake/MoleQueueCPack.cmake @@ -9,14 +9,14 @@ set(CPACK_PACKAGE_DESCRIPTION "Desktop integration of high performance computing resources.") if(APPLE) - configure_file("${MoleQueue_SOURCE_DIR}/COPYING" - "${MoleQueue_BINARY_DIR}/COPYING.txt" @ONLY) - set(CPACK_RESOURCE_FILE_LICENSE "${MoleQueue_BINARY_DIR}/COPYING.txt") + configure_file("${MoleQueue_SOURCE_DIR}/LICENSE" + "${MoleQueue_BINARY_DIR}/LICENSE.txt" @ONLY) + set(CPACK_RESOURCE_FILE_LICENSE "${MoleQueue_BINARY_DIR}/LICENSE.txt") set(CPACK_PACKAGE_ICON "${MoleQueue_SOURCE_DIR}/molequeue/app/icons/molequeue.icns") set(CPACK_BUNDLE_ICON "${CPACK_PACKAGE_ICON}") else() - set(CPACK_RESOURCE_FILE_LICENSE "${MoleQueue_SOURCE_DIR}/COPYING") + set(CPACK_RESOURCE_FILE_LICENSE "${MoleQueue_SOURCE_DIR}/LICENSE") endif() set(CPACK_PACKAGE_EXECUTABLES "molequeue" "MoleQueue")