diff options
author | Samuel Marks <807580+SamuelMarks@users.noreply.github.com> | 2020-05-23 17:16:04 +1000 |
---|---|---|
committer | Brent Cook <busterb@gmail.com> | 2020-05-24 03:15:38 -0500 |
commit | c83a3bbd721b18e3c2a0ececbfb30db3098ac617 (patch) | |
tree | cc2b5a20e8c44664641dfbed675ee5af03120553 | |
parent | d0e3ccb87a08ec73befc52cff12c829e61d65c29 (diff) | |
download | portable-c83a3bbd721b18e3c2a0ececbfb30db3098ac617.tar.gz portable-c83a3bbd721b18e3c2a0ececbfb30db3098ac617.tar.bz2 portable-c83a3bbd721b18e3c2a0ececbfb30db3098ac617.zip |
[CMakeLists.txt] Move `project` below `cmake_minimum_required`; fix indentation in its `if`/`else` block; [tap-driver.sh] Copyright line update (was automatic with `./autogen.sh`)
-rw-r--r-- | CMakeLists.txt | 11 | ||||
-rwxr-xr-x | tap-driver.sh | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a56f2e6..debaac4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
@@ -1,9 +1,12 @@ | |||
1 | if(MSVC) | 1 | if(MSVC) |
2 | cmake_minimum_required (VERSION 3.16.4) | 2 | cmake_minimum_required (VERSION 3.16.4) |
3 | cmake_policy(SET CMP0091 NEW) | 3 | cmake_policy(SET CMP0091 NEW) |
4 | else() | 4 | else() |
5 | cmake_minimum_required (VERSION 3.0) | 5 | cmake_minimum_required (VERSION 3.0) |
6 | endif() | 6 | endif() |
7 | |||
8 | project (LibreSSL C ASM) | ||
9 | |||
7 | include(CheckFunctionExists) | 10 | include(CheckFunctionExists) |
8 | include(CheckSymbolExists) | 11 | include(CheckSymbolExists) |
9 | include(CheckLibraryExists) | 12 | include(CheckLibraryExists) |
@@ -14,8 +17,6 @@ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}" ${CMAKE_MODULE_PATH}) | |||
14 | include(cmake_export_symbol) | 17 | include(cmake_export_symbol) |
15 | include(GNUInstallDirs) | 18 | include(GNUInstallDirs) |
16 | 19 | ||
17 | project (LibreSSL C ASM) | ||
18 | |||
19 | enable_testing() | 20 | enable_testing() |
20 | 21 | ||
21 | file(READ ${CMAKE_CURRENT_SOURCE_DIR}/ssl/VERSION SSL_VERSION) | 22 | file(READ ${CMAKE_CURRENT_SOURCE_DIR}/ssl/VERSION SSL_VERSION) |
diff --git a/tap-driver.sh b/tap-driver.sh index 2516e9c..865761d 100755 --- a/tap-driver.sh +++ b/tap-driver.sh | |||
@@ -1,5 +1,5 @@ | |||
1 | #! /bin/sh | 1 | #! /bin/sh |
2 | # Copyright (C) 2011-2018 Free Software Foundation, Inc. | 2 | # Copyright (C) 2011-2020 Free Software Foundation, Inc. |
3 | # | 3 | # |
4 | # This program is free software; you can redistribute it and/or modify | 4 | # This program is free software; you can redistribute it and/or modify |
5 | # it under the terms of the GNU General Public License as published by | 5 | # it under the terms of the GNU General Public License as published by |