lib/libssh2
1
0
Fork 0
mirror of https://github.com/libssh2/libssh2.git synced 2025-08-05 20:55:47 +03:00
Code Activity

cmake: simplify showing CMake version

Browse Source 
Move it to `CMakeLists.txt`. Drop `cmake --version` commands.

Credit to the `zlib-ng` project for the idea:
61e181c8ae/CMakeLists.txt (L7)

Closes #1203
This commit is contained in:
Viktor Szakats
2023-10-07 15:32:39 +00:00
parent 5e19044282
commit fc00bdd7f1
5 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.github/workflows/ci.yml vendored
View File

@@ -115,7 +115,6 @@ jobs:
crossoptions='-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_SYSTEM_VERSION=1 -DCMAKE_SYSTEM_PROCESSOR=${{ matrix.arch }}' crossoptions='-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_SYSTEM_VERSION=1 -DCMAKE_SYSTEM_PROCESSOR=${{ matrix.arch }}'
cflags='-m32 -mpclmul -msse2 -maes' cflags='-m32 -mpclmul -msse2 -maes'
fi fi
cmake --version
cmake ${crossoptions} \ cmake ${crossoptions} \
"-DCMAKE_C_FLAGS=${cflags}" \ "-DCMAKE_C_FLAGS=${cflags}" \
-DUSE_SHARED_MBEDTLS_LIBRARY=ON \ -DUSE_SHARED_MBEDTLS_LIBRARY=ON \
@@ -153,7 +152,6 @@ jobs:
if: ${{ matrix.build == 'cmake' }} if: ${{ matrix.build == 'cmake' }}
run: | run: |
[ '${{ matrix.arch }}' = 'i386' ] && crossoptions='-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_SYSTEM_VERSION=1 -DCMAKE_SYSTEM_PROCESSOR=${{ matrix.arch }} -DCMAKE_C_FLAGS=-m32' [ '${{ matrix.arch }}' = 'i386' ] && crossoptions='-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_SYSTEM_VERSION=1 -DCMAKE_SYSTEM_PROCESSOR=${{ matrix.arch }} -DCMAKE_C_FLAGS=-m32'
cmake --version
cmake -B bld ${crossoptions} $TOOLCHAIN_OPTION \ cmake -B bld ${crossoptions} $TOOLCHAIN_OPTION \
-DENABLE_WERROR=ON \ -DENABLE_WERROR=ON \
-DCRYPTO_BACKEND=${{ matrix.crypto }} \ -DCRYPTO_BACKEND=${{ matrix.crypto }} \
@@ -195,7 +193,6 @@ jobs:
- name: 'cmake configure' - name: 'cmake configure'
if: ${{ matrix.build == 'cmake' }} if: ${{ matrix.build == 'cmake' }}
run: | run: |
cmake --version
cmake -B bld \ cmake -B bld \
-DCMAKE_SYSTEM_NAME=Windows \ -DCMAKE_SYSTEM_NAME=Windows \
-DCMAKE_C_COMPILER_TARGET=${TRIPLET} \ -DCMAKE_C_COMPILER_TARGET=${TRIPLET} \
@@ -246,7 +243,6 @@ jobs:
shell: C:\cygwin\bin\bash.exe '{0}' shell: C:\cygwin\bin\bash.exe '{0}'
run: | run: |
export PATH="/usr/bin:$(cygpath ${SYSTEMROOT})/system32" export PATH="/usr/bin:$(cygpath ${SYSTEMROOT})/system32"
cmake --version
cmake -B bld \ cmake -B bld \
-DENABLE_WERROR=ON \ -DENABLE_WERROR=ON \
-DENABLE_DEBUG_LOGGING=ON \ -DENABLE_DEBUG_LOGGING=ON \
@@ -339,7 +335,6 @@ jobs:
cflags='' cflags=''
rcopts='' rcopts=''
fi fi
cmake --version
cmake -B bld ${options} \ cmake -B bld ${options} \
"-DCMAKE_C_FLAGS=${cflags}" \ "-DCMAKE_C_FLAGS=${cflags}" \
"-DCMAKE_RC_COMPILE_OBJECT=${rcopts}" \ "-DCMAKE_RC_COMPILE_OBJECT=${rcopts}" \
@@ -397,7 +392,6 @@ jobs:
else else
system='Windows' system='Windows'
fi fi
cmake --version
cmake -B bld ${options} \ cmake -B bld ${options} \
-DCMAKE_SYSTEM_NAME=${system} \ -DCMAKE_SYSTEM_NAME=${system} \
-DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake \ -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake \
@@ -479,7 +473,6 @@ jobs:
- name: 'cmake configure' - name: 'cmake configure'
if: ${{ matrix.build == 'cmake' }} if: ${{ matrix.build == 'cmake' }}
run: | run: |
cmake --version
cmake -B bld ${{ matrix.crypto.cmake }} \ cmake -B bld ${{ matrix.crypto.cmake }} \
-DCMAKE_UNITY_BUILD=ON \ -DCMAKE_UNITY_BUILD=ON \
-DENABLE_WERROR=ON \ -DENABLE_WERROR=ON \

1
CMakeLists.txt
View File

@@ -37,6 +37,7 @@
# SPDX-License-Identifier: BSD-3-Clause # SPDX-License-Identifier: BSD-3-Clause
cmake_minimum_required(VERSION 3.7) cmake_minimum_required(VERSION 3.7)
message(STATUS "Using CMake version ${CMAKE_VERSION}")
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH}) set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})

1
appveyor.yml
View File

@@ -185,7 +185,6 @@ build_script:
# 'libssh2_session_handshake failed (-43): Failed getting banner' # 'libssh2_session_handshake failed (-43): Failed getting banner'
$options += '-DRUN_SSHD_TESTS=OFF' $options += '-DRUN_SSHD_TESTS=OFF'
cmake --version
Write-Host 'CMake options:' $options Write-Host 'CMake options:' $options
cmake -B _builds $options cmake -B _builds $options
cmake --build _builds --config "$env:CONFIGURATION" cmake --build _builds --config "$env:CONFIGURATION"

1
tests/cmake/CMakeLists.txt
View File

@@ -2,6 +2,7 @@
# SPDX-License-Identifier: BSD-3-Clause # SPDX-License-Identifier: BSD-3-Clause
cmake_minimum_required(VERSION 3.7) cmake_minimum_required(VERSION 3.7)
message(STATUS "Using CMake version ${CMAKE_VERSION}")
project(test-dependent C) project(test-dependent C)

2
tests/cmake/test.sh
View File

@@ -8,8 +8,6 @@ set -u
cd "$(dirname "$0")" cd "$(dirname "$0")"
cmake --version
rm -rf bld-fetchcontent; cmake -B bld-fetchcontent -DTEST_INTEGRATION_MODE=FetchContent \ rm -rf bld-fetchcontent; cmake -B bld-fetchcontent -DTEST_INTEGRATION_MODE=FetchContent \
-DFROM_GIT_REPO="${PWD}/../.." \ -DFROM_GIT_REPO="${PWD}/../.." \
-DFROM_GIT_TAG="$(git rev-parse HEAD)" -DFROM_GIT_TAG="$(git rev-parse HEAD)"