diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 74efd07e..15320e85 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -103,8 +103,8 @@ jobs: export CMAKE_BUILD_TYPE export QUIC_TLS export QUIC_ENABLE_LOGGING - if "${QUIC_ENABLE_LOGGING}" == "ON" ; then - + if [ "${QUIC_ENABLE_LOGGING}" == "ON" ] ; then + export QUIC_LOGGING_TYPE=lttng sudo apt-add-repository ppa:lttng/stable-2.13 sudo apt-get update sudo apt-get install -y lttng-tools babeltrace liblttng-ust-dev lttng-modules-dkms- diff --git a/CMakeLists.txt b/CMakeLists.txt index 554267d5..a3d50c2b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -134,7 +134,7 @@ set_target_properties(quicer_nif LIBRARY_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/priv/ ) -if (QUIC_ENABLE_LOGGING AND QUIC_LOGGING_TYPE STREQUAL "lttng") +if (QUIC_ENABLE_LOGGING STREQUAL "ON" AND QUIC_LOGGING_TYPE STREQUAL "lttng") set_target_properties(msquic.lttng PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/priv) set_target_properties(msquic.lttng PROPERTIES LIBRARY_OUTPUT_DIRECTORY_DEBUG ${CMAKE_CURRENT_SOURCE_DIR}/priv) endif()