From 79dd803410739bd9621e285c080984eadf50ae5b Mon Sep 17 00:00:00 2001 From: Damian Rouson Date: Tue, 12 Dec 2017 18:32:21 -0800 Subject: [PATCH] Adapt "cmake/" subdirectory to PSBLAS --- cmake/AddInstallationScriptTest.cmake | 2 +- cmake/makeDist.cmake | 8 ++++---- cmake/opencoarrays-VER-SHA256.txt.in | 3 --- cmake/pkg/OpenCoarraysConfig.cmake.in | 1 - cmake/pkg/PSBLASConfig.cmake.in | 1 + ...VER-SHA256.txt.asc.in => psblas-VER-SHA256.txt.asc.in} | 4 ++-- cmake/psblas-VER-SHA256.txt.in | 3 +++ 7 files changed, 11 insertions(+), 11 deletions(-) delete mode 100644 cmake/opencoarrays-VER-SHA256.txt.in delete mode 100644 cmake/pkg/OpenCoarraysConfig.cmake.in create mode 100644 cmake/pkg/PSBLASConfig.cmake.in rename cmake/{opencoarrays-VER-SHA256.txt.asc.in => psblas-VER-SHA256.txt.asc.in} (78%) create mode 100644 cmake/psblas-VER-SHA256.txt.in diff --git a/cmake/AddInstallationScriptTest.cmake b/cmake/AddInstallationScriptTest.cmake index ecf764bce..d6f7f9168 100644 --- a/cmake/AddInstallationScriptTest.cmake +++ b/cmake/AddInstallationScriptTest.cmake @@ -10,5 +10,5 @@ macro(add_installation_script_test name path) ) add_test(NAME test-${name} COMMAND "${CMAKE_BINARY_DIR}/${path}/${name}") set_property(TEST test-${name} PROPERTY WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/${path}") - set_property(TEST test-${name} PROPERTY ENVIRONMENT "OPENCOARRAYS_SRC_DIR=${CMAKE_SOURCE_DIR}") + set_property(TEST test-${name} PROPERTY ENVIRONMENT "PSBLAS_SRC_DIR=${CMAKE_SOURCE_DIR}") endmacro(add_installation_script_test) diff --git a/cmake/makeDist.cmake b/cmake/makeDist.cmake index 4011eceea..f0b465660 100644 --- a/cmake/makeDist.cmake +++ b/cmake/makeDist.cmake @@ -26,8 +26,8 @@ if(NOT (git_status STREQUAL "0")) ${git_version}") endif() -set(archive "OpenCoarrays-${git_version}") -set(l_archive "opencoarrays-${git_version}") +set(archive "PSBLAS-${git_version}") +set(l_archive "PSBLAS-${git_version}") set(release_asset "${CMAKE_ARGV4}/${archive}.tar.gz") execute_process( COMMAND "${GIT_EXECUTABLE}" archive "--prefix=${archive}/" -o "${release_asset}" "${git_version}" @@ -45,7 +45,7 @@ endif() file(SHA256 "${release_asset}" tarball_sha256) set(sha256_checksum "${tarball_sha256} ${archive}.tar.gz") -configure_file("${CMAKE_ARGV3}/cmake/opencoarrays-VER-SHA256.txt.in" +configure_file("${CMAKE_ARGV3}/cmake/PSBLAS-VER-SHA256.txt.in" "${CMAKE_ARGV4}/${l_archive}-SHA256.txt" @ONLY) message( STATUS @@ -65,7 +65,7 @@ if(GPG_EXECUTABLE) message( WARNING "GPG signing of ${CMAKE_ARGV4}/${l_archive}-SHA256.txt appears to have failed with status: ${gpg_status} and output: ${gpg_output}") else() - configure_file("${CMAKE_ARGV3}/cmake/opencoarrays-VER-SHA256.txt.asc.in" + configure_file("${CMAKE_ARGV3}/cmake/PSBLAS-VER-SHA256.txt.asc.in" "${CMAKE_ARGV4}/${l_archive}-GPG.comment" @ONLY) file(READ "${CMAKE_ARGV4}/${l_archive}-GPG.comment" gpg_comment) diff --git a/cmake/opencoarrays-VER-SHA256.txt.in b/cmake/opencoarrays-VER-SHA256.txt.in deleted file mode 100644 index 5c2e8af81..000000000 --- a/cmake/opencoarrays-VER-SHA256.txt.in +++ /dev/null @@ -1,3 +0,0 @@ -# To verify cryptographic checksums `shasum -c opencoarrays-@git_version@-SHA256.txt` on Mac OS X, or -# `sha256sum -c opencoarrays-@git_version@-SHA256.txt` on Linux. -@sha256_checksum@ diff --git a/cmake/pkg/OpenCoarraysConfig.cmake.in b/cmake/pkg/OpenCoarraysConfig.cmake.in deleted file mode 100644 index 1be75d0c6..000000000 --- a/cmake/pkg/OpenCoarraysConfig.cmake.in +++ /dev/null @@ -1 +0,0 @@ -include("${CMAKE_CURRENT_LIST_DIR}/OpenCoarraysTargets.cmake") diff --git a/cmake/pkg/PSBLASConfig.cmake.in b/cmake/pkg/PSBLASConfig.cmake.in new file mode 100644 index 000000000..93b403daa --- /dev/null +++ b/cmake/pkg/PSBLASConfig.cmake.in @@ -0,0 +1 @@ +include("${CMAKE_CURRENT_LIST_DIR}/PSBLASTargets.cmake") diff --git a/cmake/opencoarrays-VER-SHA256.txt.asc.in b/cmake/psblas-VER-SHA256.txt.asc.in similarity index 78% rename from cmake/opencoarrays-VER-SHA256.txt.asc.in rename to cmake/psblas-VER-SHA256.txt.asc.in index 3345fbf42..22cd9211b 100644 --- a/cmake/opencoarrays-VER-SHA256.txt.asc.in +++ b/cmake/psblas-VER-SHA256.txt.asc.in @@ -6,7 +6,7 @@ Comment: Next add it to your GPG keyring, e.g., Comment: `curl https://izaakbeekman.com/izaak.pubkey.txt | gpg --import` Comment: Make sure you have verified that the release archive's Comment: SHA256 checksum matches the provided -Comment: opencoarrays-@git_version@-SHA256.txt and ensure that this file +Comment: psblas-@git_version@-SHA256.txt and ensure that this file Comment: and it's signature are in the same directory. Then Comment: verify with: -Comment: `gpg --verify opencoarrays-@git_version@-SHA256.txt.asc` +Comment: `gpg --verify psblas-@git_version@-SHA256.txt.asc` diff --git a/cmake/psblas-VER-SHA256.txt.in b/cmake/psblas-VER-SHA256.txt.in new file mode 100644 index 000000000..1b3888c42 --- /dev/null +++ b/cmake/psblas-VER-SHA256.txt.in @@ -0,0 +1,3 @@ +# To verify cryptographic checksums `shasum -c psblas-@git_version@-SHA256.txt` on Mac OS X, or +# `sha256sum -c psblas-@git_version@-SHA256.txt` on Linux. +@sha256_checksum@