diff options
| author | Austin S. Hemmelgarn <austin@netdata.cloud> | 2024-03-28 07:05:19 -0400 |
|---|---|---|
| committer | Austin S. Hemmelgarn <ahferroin7@gmail.com> | 2024-04-01 11:25:53 -0400 |
| commit | 226a16b283a92b5d2215ccf938326a46344b6f68 (patch) | |
| tree | cc8be095416386917ca383515ef8f3ab52704a8c | |
| parent | c50cb022d736f5a60cbcbee41ad2bd3443ab5d45 (diff) | |
Correctly handle libyaml linking for log2journal. (#17276)
It somehow got missed when moving the libyaml bundling into the CMake
code.
(cherry picked from commit 20682b52812f67904404535a6250fecf4a53f605)
| -rw-r--r-- | CMakeLists.txt | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4bb75e0ea6..0d07d620ef 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2096,14 +2096,7 @@ if(PCRE2_FOUND) target_compile_definitions(log2journal PUBLIC ${PCRE2_CFLAGS_OTHER}) target_link_libraries(log2journal PUBLIC "${PCRE2_LDFLAGS}") - if(ENABLE_BUNDLED_YAML) - target_include_directories(log2journal BEFORE PUBLIC "${CMAKE_SOURCE_DIR}/externaldeps/libyaml") - target_link_libraries(log2journal PUBLIC yaml) - else() - target_include_directories(log2journal BEFORE PUBLIC ${YAML_INCLUDE_DIRS}) - target_compile_definitions(log2journal PUBLIC ${YAML_CFLAGS_OTHER}) - target_link_libraries(log2journal PUBLIC ${YAML_LDFLAGS}) - endif() + netdata_add_libyaml_to_target(log2journal) install(TARGETS log2journal COMPONENT log2journal |