lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-07-29 13:01:13 +03:00
Code Activity

cmake: Only enable CXX when running the coverage

Browse Source 
Commit 25a678190c introduced code coverage
collection. That also introduced a dependency to CXX language.

When cross-compiling libssh in an environment that doesn't have a C++ compiler
the following error is raised: "No CMAKE_CXX_COMPILER could be found.".

Since the C++ part is only needed for the coverage part, this commit only enable
that language dependency when actually needing it.

Signed-off-by: Thomas Perale <thomas.perale@mind.be>
Reviewed-by: Jakub Jelen <jjelen@redhat.com>
(cherry picked from commit cb0237e85b)
This commit is contained in:
Thomas Perale
2024-09-14 21:07:30 +02:00
committed by Jakub Jelen
parent 854795c654
commit 093431f929
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -9,7 +9,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules")
include(DefineCMakeDefaults) include(DefineCMakeDefaults)
include(DefineCompilerFlags) include(DefineCompilerFlags)
project(libssh VERSION 0.11.1 LANGUAGES C CXX) project(libssh VERSION 0.11.1 LANGUAGES C)
# global needed variable # global needed variable
set(APPLICATION_NAME ${PROJECT_NAME}) set(APPLICATION_NAME ${PROJECT_NAME})
@ -190,6 +190,7 @@ endif (WITH_SYMBOL_VERSIONING AND ABIMAP_FOUND)
# Coverage # Coverage
if (WITH_COVERAGE) if (WITH_COVERAGE)
ENABLE_LANGUAGE(CXX)
include(CodeCoverage) include(CodeCoverage)
setup_target_for_coverage_lcov( setup_target_for_coverage_lcov(
NAME "coverage" NAME "coverage"

1
cmake/Modules/AddCMockaTest.cmake
View File

@ -117,6 +117,7 @@ function(ADD_CMOCKA_TEST _TARGET_NAME)
${TARGET_SYSTEM_EMULATOR} ${_TARGET_NAME} ${TARGET_SYSTEM_EMULATOR} ${_TARGET_NAME}
) )
if (WITH_COVERAGE) if (WITH_COVERAGE)
ENABLE_LANGUAGE(CXX)
include(CodeCoverage) include(CodeCoverage)
append_coverage_compiler_flags_to_target(${_TARGET_NAME}) append_coverage_compiler_flags_to_target(${_TARGET_NAME})
endif (WITH_COVERAGE) endif (WITH_COVERAGE)