Skip to content

Commit 7b88578

Browse files
committed
Set gcov program from environment on CI
1 parent 0ee9ae7 commit 7b88578

File tree

4 files changed

+35
-35
lines changed

4 files changed

+35
-35
lines changed

.github/workflows/macos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
3838
- name: macos clang++-19 ${{ matrix.preset }}
3939
if: startsWith(matrix.compiler, 'clang')
40-
run: CXX=$(brew --prefix llvm@19)/bin/clang++ cmake --workflow --preset ${{ matrix.preset }}
40+
run: GCOV=$(brew --prefix llvm@19)/bin/llvm-cov CXX=$(brew --prefix llvm@19)/bin/clang++ cmake --workflow --preset ${{ matrix.preset }}
4141

4242
- name: macos g++ ${{ matrix.preset }}
4343
if: startsWith(matrix.compiler, 'g++')

CMakeLists.txt

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,14 @@ target_compile_features(
6363

6464
# export cmake config package
6565
block()
66-
# copied from execution26:
67-
set(TARGET_NAME beman_inplace_vector)
68-
set(TARGET_NAMESPACE beman)
69-
# set(TARGET_PREFIX ${TARGET_NAMESPACE}.${TARGET_NAME}) # FIXME: not used yet? CK
66+
# NOTE: copied from execution26:
67+
# FIXME: but not yet used? CK
68+
# set(TARGET_NAME inplace_vector)
69+
# set(TARGET_NAMESPACE beman)
70+
# set(TARGET_PREFIX ${TARGET_NAMESPACE}.${TARGET_NAME})
7071
# set(TARGET_LIBRARY ${PROJECT_NAME})
7172
# set(TARGET_ALIAS ${TARGET_NAMESPACE}::${TARGET_LIBRARY})
73+
7274
set(TARGET_PACKAGE_NAME ${PROJECT_NAME}-config)
7375
set(TARGETS_EXPORT_NAME ${PROJECT_NAME}-targets)
7476
set(INSTALL_CONFIGDIR ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
@@ -80,36 +82,34 @@ block()
8082
FILE_SET inplace_vector_public_headers
8183
)
8284

83-
if(EXISTS cmake/Config.cmake.in)
84-
write_basic_package_version_file(
85-
${CMAKE_CURRENT_BINARY_DIR}/${TARGET_PACKAGE_NAME}-version.cmake
86-
VERSION ${PROJECT_VERSION}
87-
COMPATIBILITY AnyNewerVersion
88-
)
85+
write_basic_package_version_file(
86+
${CMAKE_CURRENT_BINARY_DIR}/${TARGET_PACKAGE_NAME}-version.cmake
87+
VERSION ${PROJECT_VERSION}
88+
COMPATIBILITY AnyNewerVersion
89+
)
8990

90-
configure_package_config_file(
91-
cmake/Config.cmake.in
91+
configure_package_config_file(
92+
cmake/Config.cmake.in
93+
${CMAKE_CURRENT_BINARY_DIR}/${TARGET_PACKAGE_NAME}.cmake
94+
INSTALL_DESTINATION ${INSTALL_CONFIGDIR}
95+
)
96+
97+
install(
98+
FILES
9299
${CMAKE_CURRENT_BINARY_DIR}/${TARGET_PACKAGE_NAME}.cmake
93-
INSTALL_DESTINATION ${INSTALL_CONFIGDIR}
94-
)
95-
96-
install(
97-
FILES
98-
${CMAKE_CURRENT_BINARY_DIR}/${TARGET_PACKAGE_NAME}.cmake
99-
${CMAKE_CURRENT_BINARY_DIR}/${TARGET_PACKAGE_NAME}-version.cmake
100-
DESTINATION ${INSTALL_CONFIGDIR}
101-
)
102-
103-
install(
104-
EXPORT ${TARGETS_EXPORT_NAME}
105-
FILE ${TARGETS_EXPORT_NAME}.cmake
106-
DESTINATION "${INSTALL_CONFIGDIR}"
107-
NAMESPACE beman::
108-
)
109-
110-
set(CPACK_GENERATOR TGZ)
111-
include(CPack)
112-
endif()
100+
${CMAKE_CURRENT_BINARY_DIR}/${TARGET_PACKAGE_NAME}-version.cmake
101+
DESTINATION ${INSTALL_CONFIGDIR}
102+
)
103+
104+
install(
105+
EXPORT ${TARGETS_EXPORT_NAME}
106+
FILE ${TARGETS_EXPORT_NAME}.cmake
107+
DESTINATION "${INSTALL_CONFIGDIR}"
108+
NAMESPACE beman::
109+
)
110+
111+
set(CPACK_GENERATOR TGZ)
112+
include(CPack)
113113
endblock()
114114

115115
if(BEMAN_INPLACE_VECTOR_BUILD_TESTS)

cmake/CMakeDarwinPresets.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"CMAKE_CONFIGURATION_TYPES": "Debug;RelWithDebInfo;Coverage;Asan;Lsan;Usan",
2222
"CMAKE_CXX_FLAGS": "-Wall -Wextra -Wpedantic",
2323
"CMAKE_C_FLAGS": "-Wall -Wextra -Wpedantic",
24-
"GCOV_EXECUTABLE": "llvm-cov gcov"
24+
"GCOV_EXECUTABLE": "$env{GCOV} gcov"
2525
}
2626
},
2727
{

cmake/CMakeLinuxPresets.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"CMAKE_CONFIGURATION_TYPES": "Debug;RelWithDebInfo;Coverage;Asan;Lsan;Usan",
2222
"CMAKE_CXX_FLAGS": "-Wall -Wextra -Wpedantic",
2323
"CMAKE_C_FLAGS": "-Wall -Wextra -Wpedantic",
24-
"GCOV_EXECUTABLE": "llvm-cov gcov"
24+
"GCOV_EXECUTABLE": "$env{GCOV} gcov"
2525
}
2626
},
2727
{

0 commit comments

Comments
 (0)