Merge pull request #23 from cryos/updates

Updates
OpenChemistry · Jan 31, 2018 · efcca96 · efcca96
2 parents 2aab341 + a240614
commit efcca96
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git 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}")
@@ -96,7 +96,7 @@ install(
   FILES
     README.md
     CONTRIBUTING.md
-    COPYING
+    LICENSE
   DESTINATION "${INSTALL_DOC_DIR}/molequeue")
 
 include(MoleQueueCPack)
diff --git a/COPYING → LICENSE b/COPYING → LICENSE
@@ -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

diff --git 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")