Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
94 commits
Select commit Hold shift + click to select a range
331dcb4
Remove ChangeLog
SiskaPavel Mar 3, 2025
5b36a19
Remove NEWS
SiskaPavel Mar 3, 2025
bf6f5bc
Remove autoconf files
SiskaPavel Mar 3, 2025
8606719
Remove ipfixprobe spec file
SiskaPavel Mar 3, 2025
79c50de
.gitignore - update ignored directories
SiskaPavel Mar 3, 2025
d7b8516
Update LICENSE
SiskaPavel Mar 3, 2025
40d3670
Create new directory structure
SiskaPavel Mar 3, 2025
29998fe
.clang-format - update format rules
SiskaPavel Mar 3, 2025
0b17c87
.clang-tidy - add clang-tidy configuration
SiskaPavel Mar 3, 2025
dcbfb0e
CMake - introduce initial build configuration
SiskaPavel Mar 3, 2025
83891be
Remove #include <config.h>
SiskaPavel Mar 3, 2025
38fa976
CMake - introduce directory for external libraries
SiskaPavel Mar 3, 2025
cb72a62
CMake - introduce telemetry library
SiskaPavel Mar 3, 2025
fc2aa56
CMake - introduce dependency on libatomic
SiskaPavel Mar 3, 2025
b83c324
CMake - introduce dependency on libunwind
SiskaPavel Mar 3, 2025
b75d567
CMake - introduce CMakeLists for ipfixprobe core
SiskaPavel Mar 3, 2025
c6020c8
ipfixprobe - remove input benchmark plugin
SiskaPavel Mar 3, 2025
62c1159
ipfixprobe - remove input stem plugin
SiskaPavel Mar 3, 2025
28d3c6e
ipfixprobe - remove process flexprobe plugin
SiskaPavel Mar 3, 2025
4a65d48
ipfixprobe - introduce pluginFactory
SiskaPavel Mar 3, 2025
4bb1a30
Makefile - introduce initial Makefile
SiskaPavel Mar 3, 2025
57a4823
Makefile - introduce format and tidy target
SiskaPavel Mar 3, 2025
b9434fc
Reformat whole repository using clang-format
SiskaPavel Mar 3, 2025
ceded8c
ipfixprobe - introduce API function
SiskaPavel Mar 4, 2025
5e51e58
Mark IpfixBasicList as visible
Mar 19, 2025
c5b1639
ipfixprobe - refactor InputPlugin
SiskaPavel Mar 4, 2025
3fe5d24
ipfixprobe - refactor StoragePlugin
SiskaPavel Mar 4, 2025
1298075
ipfixprobe - introduce packet parser
SiskaPavel Mar 4, 2025
b8f6ed2
ipfixprobe - introduce input PCAP plugin
SiskaPavel Mar 4, 2025
76bc6f3
ipfixprobe - introduce input RAW plugin
SiskaPavel Mar 4, 2025
7bf48f7
ipfixprobe - refactor OutputPlugin
SiskaPavel Mar 4, 2025
f337ee7
ipfixprobe - refactor ProcessPlugin
SiskaPavel Mar 4, 2025
32946b6
ipfixprobe - mark OptionsParser class as visible
SiskaPavel Mar 4, 2025
6b8b65e
ipfixprobe - refactor PluginManager
SiskaPavel Mar 4, 2025
e945e60
ipfixprobe - introduce output TEXT plugin
Mar 17, 2025
ef2fc7a
ipfixprobe - introduce process BASICPLUS plugin
Mar 17, 2025
264a9a5
ipfixprobe - fix visibility of ipx_ring
Mar 17, 2025
8fa7b5c
ipfixprobe - introduce storage CACHE plugin
Mar 17, 2025
e98641c
ipfixprobe - introduce input DPDK plugin
Mar 18, 2025
b1feb5d
ipfixprobe - introduce input NFB plugin
Mar 18, 2025
a1d74d2
ipfixprobe - introduce output IPFIX plugin
Mar 19, 2025
f3e5e2e
ipfixprobe - introduce output UNIREC plugin
Mar 19, 2025
a939736
ipfixprobe - introduce process BSTATS plugin
Mar 19, 2025
f657253
ipfixprobe - introduce process ICMP plugin
Mar 19, 2025
4d65aa2
ipfixprobe - introduce process VLAN plugin
Mar 19, 2025
8252fd2
ipfixprobe - introduce process FLOW HASH plugin
Mar 19, 2025
91d5d2d
ipfixprobe - introduce process OSQUERY plugin
Mar 19, 2025
141c260
ipfixprobe - introduce process IDPCONTENT plugin
Mar 19, 2025
210917d
ipfixprobe - introduce process PHISTS plugin
Mar 19, 2025
4ee3d54
ipfixprobe - introduce process PSTATS plugin
Mar 19, 2025
1b60b9c
ipfixprobe - introduce process SIP plugin
Mar 19, 2025
b078c98
ipfixprobe - introduce process OVPN plugin
Mar 19, 2025
9fa3f8d
ipfixprobe - remove STATS process plugin
Mar 19, 2025
cbc49bd
ipfixprobe - introduce process SSDP plugin
Mar 19, 2025
2870c2e
ipfixprobe - introduce process SSADETECTOR plugin
Mar 19, 2025
cf6bf05
ipfixprobe - introduce process MQTT plugin
Mar 19, 2025
4cf7c74
ipfixprobe - introduce process DNS plugin
Mar 19, 2025
756b17b
ipfixprobe - introduce process DNSSD plugin
Mar 19, 2025
47b8507
ipfixprobe - introduce process NETBIOS plugin
Mar 19, 2025
2bff17f
ipfixprobe - introduce process PASSIVEDNS plugin
Mar 19, 2025
191e6ba
ipfixprobe - introduce process SMTP plugin
Mar 19, 2025
68c52a7
ipfixprobe - introduce process common
Mar 19, 2025
47495d9
ipfixprobe - introduce process QUIC plugin
Mar 19, 2025
e50f571
ipfixprobe - introduce process TLS plugin
Mar 19, 2025
2330a21
ipfixprobe - introduce process RTSP plugin
Mar 19, 2025
cae47fc
ipfixprobe - introduce process MPLS plugin
Mar 19, 2025
7f23373
ipfixprobe - introduce process WIREGUARD plugin
Mar 19, 2025
8e10f53
ipfixprobe - introduce process HTTP plugin
Mar 19, 2025
e3eea25
ipfixprobe - introduce process NTP plugin
Mar 19, 2025
73c6d9b
ipfixprobe - introduce process NETTISA plugin
Mar 19, 2025
2dd2be2
ipfixprobe - remove create process plugin script
Mar 19, 2025
72f02ae
ipfixprobe - refactor ipfixprobe and workers
Mar 19, 2025
d973c5c
ipfixprobe - add option -L PATH to specify plugins path
Mar 21, 2025
941b332
CMake: introduce support for building .tar.gz and .rpm packages
Mar 20, 2025
d5c8368
CMake: add option to build ipfixprobe with miliseconds timestamp prec…
Mar 20, 2025
c5611b5
CMake: add option to build with NEMEA
Mar 20, 2025
6bec741
Remove unit tests
Mar 20, 2025
44dc3a4
Refactor functional tests
Mar 20, 2025
f73fc38
CI: remove old workflows
Mar 21, 2025
75719f6
Remove .travis.yml
Mar 21, 2025
67d61f6
Github-actions: add composite install dependencies action
Mar 21, 2025
a65fbcb
Github-actions: add check workflow
Mar 21, 2025
2845576
Github-actions: add build workflow
Mar 22, 2025
91ac865
Github-actions: add tests workflow
Mar 22, 2025
fe224dc
Github-actions: add rpm-build workflow
Mar 25, 2025
4de409b
Github-actions: add rpm-install workflow
Mar 25, 2025
e69336c
Github-actions: add ciEntryPoint workflow
Mar 21, 2025
a579c66
CMake: add init directory to CMake and spec file
Mar 23, 2025
1a80553
ipfixprobe: register process plugin ID at runtime
Mar 23, 2025
5a30593
.editordonfig: Add editorconfig config file
Mar 24, 2025
aaff919
editorconfig - fix editor config warnings
Mar 25, 2025
b59e22b
CMake: introduce rpm-msec and rpm-nemea target
Mar 25, 2025
2937ff3
ipfixprobe - remove flexprobe ipfix elements
Mar 25, 2025
e0affe0
Dockerfile: update ipfixprobe packages
Mar 25, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
editorconfig - fix editor config warnings
  • Loading branch information
Pavel Siska committed Mar 25, 2025
commit aaff9195e0f96649f409c05dc5dad0451bd4e5d3
14 changes: 7 additions & 7 deletions .github/actions/install-dependencies/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ inputs:
description: 'Install DPDK dependencies'
required: false
default: false

nemea:
description: 'Install NEMEA dependencies'
required: false
Expand All @@ -31,7 +31,7 @@ inputs:
description: 'Install dependencies for tests'
required: false
default: false

runs:
using: 'composite'
steps:
Expand All @@ -40,15 +40,15 @@ runs:
run: |
dnf config-manager --set-enabled ol9_codeready_builder
dnf install -y dnf-plugins-core epel-release
dnf install -y make gcc-c++ cmake3 git rpm-build
dnf install -y make gcc-c++ cmake3 git rpm-build
dnf install -y fuse3-devel openssl-devel gcc-toolset-14-libatomic-devel libunwind-devel lz4-devel

- name: Install clang tools
if: ${{ inputs.clang-tools == 'true' }}
shell: bash
run: |
dnf install -y clang clang-tools-extra

- name: Install libpcap-devel
if: ${{ inputs.pcap == 'true' }}
shell: bash
Expand All @@ -61,20 +61,20 @@ runs:
run: |
dnf copr enable @CESNET/nfb-framework
dnf install -y nfb-framework numactl-devel

- name: Install DPDK dependencies
if: ${{ inputs.dpdk == 'true' }}
shell: bash
run: |
dnf install -y dpdk-devel

- name: Install NEMEA dependencies
if: ${{ inputs.nemea == 'true' }}
shell: bash
run: |
dnf copr enable @CESNET/NEMEA-stable
dnf install -y nemea-framework-devel

- name: Install dependencies for tests
if: ${{ inputs.tests == 'true' }}
shell: bash
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,9 @@ jobs:
run: git config --system --add safe.directory $PWD
- name: Create build directory
run: mkdir build
- name: Configure CMake
- name: Configure CMake
run: |
cd build
cmake3 .. -DCMAKE_BUILD_TYPE=Debug -DENABLE_INPUT_PCAP=ON -DENABLE_INPUT_DPDK=ON -DENABLE_INPUT_NFB=ON -DENABLE_PROCESS_EXPERIMENTAL=ON
- name: make
run: make

2 changes: 1 addition & 1 deletion .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ jobs:
- name: Check out repository code
uses: actions/checkout@v4
- name: Check editorconfig
run: ec --exclude .git
run: ec --exclude .git --exclude tests/functional/inputs
2 changes: 1 addition & 1 deletion .github/workflows/ciEntryPoint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
uses: ./.github/workflows/build.yml
with:
os: ${{ matrix.os }}

make-tests:
needs: [build-os-matrix]
strategy:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
run: git config --system --add safe.directory $PWD
- name: Create build directory
run: mkdir build
- name: Configure CMake
- name: Configure CMake
run: |
cd build
cmake3 .. -DENABLE_NEMEA=ON -DENABLE_INPUT_PCAP=ON -DENABLE_OUTPUT_UNIREC=ON -DENABLE_PROCESS_EXPERIMENTAL=ON -DENABLE_TESTS=ON
Expand Down
16 changes: 8 additions & 8 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ option(ENABLE_RPMBUILD "Enable build of RPM package"
option(ENABLE_TESTS "Build tests (make test)" OFF)

if(ENABLE_MILISECONDS_TIMESTAMP)
add_compile_definitions(IPXP_TS_MSEC)
add_compile_definitions(IPXP_TS_MSEC)
endif()

if(ENABLE_NEMEA)
Expand Down Expand Up @@ -57,12 +57,12 @@ add_subdirectory(pkg)
add_subdirectory(init)

if (ENABLE_TESTS)
if (NOT ENABLE_NEMEA OR NOT ENABLE_OUTPUT_UNIREC OR NOT ENABLE_INPUT_PCAP)
message(FATAL_ERROR
"ENABLE_TESTS requires ENABLE_NEMEA, "
"ENABLE_INPUT_PCAP and ENABLE_OUTPUT_UNIREC to be enabled."
)
endif()
if (NOT ENABLE_NEMEA OR NOT ENABLE_OUTPUT_UNIREC OR NOT ENABLE_INPUT_PCAP)
message(FATAL_ERROR
"ENABLE_TESTS requires ENABLE_NEMEA, "
"ENABLE_INPUT_PCAP and ENABLE_OUTPUT_UNIREC to be enabled."
)
endif()
enable_testing()
add_subdirectory(tests)
add_subdirectory(tests)
endif()
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ Here are the examples of various plugins usage:
`./ipfixprobe -i 'dpdk-ring;r=rx_ipfixprobe_0;e= --proc-type=secondary' -i 'dpdk-ring;r=rx_ipfixprobe_1' -i 'dpdk-ring;r=rx_ipfixprobe_2' -i 'dpdk-ring;r=rx_ipfixprobe_3' -o 'text'`
```

## Build
## Build

### Requirements
- libatomic
Expand Down Expand Up @@ -129,7 +129,7 @@ To install ipfixprobe with NEMEA dependency from binary RPM packages, it is poss

## Telemetry

`ipfixprobe` exports statistics and other diagnostic information through a telemetry interface based on appFs library, which leverages the fuse3 library (filesystem in userspace) to allow telemetry data to be accessed and manipulated
`ipfixprobe` exports statistics and other diagnostic information through a telemetry interface based on appFs library, which leverages the fuse3 library (filesystem in userspace) to allow telemetry data to be accessed and manipulated
through standard filesystem operations.

```
Expand Down Expand Up @@ -264,4 +264,3 @@ Turn off message buffering using `buffer=off` option and set `timeout=WAIT` on o
```
./ipfixprobe -i 'pcap;file=traffic.pcap' -o 'unirec;i=u:out:timeout=WAIT:buffer=off'
```

2 changes: 1 addition & 1 deletion cmake/dependencies.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ find_package(OpenSSL REQUIRED)
if (ENABLE_INPUT_PCAP)
pkg_check_modules(PCAP REQUIRED libpcap)
endif()

if (ENABLE_INPUT_DPDK)
pkg_check_modules(DPDK REQUIRED libdpdk)
endif()
Expand Down
21 changes: 10 additions & 11 deletions cmake/modules/FindAtomic.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,23 @@
#

find_library(ATOMIC_LIBRARY
NAMES atomic libatomic.so.1
HINTS ${ATOMIC_ROOT}
${CMAKE_INSTALL_LIBDIR})
NAMES atomic libatomic.so.1
HINTS ${ATOMIC_ROOT} ${CMAKE_INSTALL_LIBDIR})

include(FindPackageHandleStandardArgs)
find_package_handle_standard_args (Atomic
REQUIRED_VARS ATOMIC_LIBRARY
REQUIRED_VARS ATOMIC_LIBRARY
)

if (ATOMIC_FOUND AND NOT TARGET atomic::atomic)
add_library(atomic::atomic STATIC IMPORTED)
set_target_properties(atomic::atomic PROPERTIES
IMPORTED_LOCATION "${ATOMIC_LIBRARY}"
INTERFACE_INCLUDE_DIRECTORIES "${ATOMIC_INCLUDE_DIR}")
target_compile_definitions(atomic::atomic INTERFACE UNWIND_FOUND)
add_library(atomic::atomic STATIC IMPORTED)
set_target_properties(atomic::atomic PROPERTIES
IMPORTED_LOCATION "${ATOMIC_LIBRARY}"
INTERFACE_INCLUDE_DIRECTORIES "${ATOMIC_INCLUDE_DIR}")
target_compile_definitions(atomic::atomic INTERFACE UNWIND_FOUND)
else()
message(CRITICAL "Notice: atomic not found")
add_library(atomic::atomic INTERFACE IMPORTED)
message(CRITICAL "Notice: atomic not found")
add_library(atomic::atomic INTERFACE IMPORTED)
endif()

unset(ATOMIC_LIBRARY)
104 changes: 52 additions & 52 deletions cmake/modules/FindLZ4.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ Use this module by invoking find_package with the form::

.. code-block:: cmake

find_package(LZ4
[version] # Minimum version e.g. 1.8.0
[REQUIRED] # Fail with error if LZ4 is not found
)
find_package(LZ4
[version] # Minimum version e.g. 1.8.0
[REQUIRED] # Fail with error if LZ4 is not found
)

Imported targets
^^^^^^^^^^^^^^^^
Expand All @@ -23,26 +23,26 @@ This module defines the following :prop_tgt:`IMPORTED` targets:

.. variable:: lz4::lz4

Imported target for using the LZ4 library, if found.
Imported target for using the LZ4 library, if found.

Result variables
^^^^^^^^^^^^^^^^

.. variable:: LZ4_FOUND

Set to true if LZ4 library found, otherwise false or undefined.
Set to true if LZ4 library found, otherwise false or undefined.

.. variable:: LZ4_INCLUDE_DIRS

Paths to include directories listed in one variable for use by LZ4 client.
Paths to include directories listed in one variable for use by LZ4 client.

.. variable:: LZ4_LIBRARIES

Paths to libraries to linked against to use LZ4.
Paths to libraries to linked against to use LZ4.

.. variable:: LZ4_VERSION

The version string of LZ4 found.
The version string of LZ4 found.

Cache variables
^^^^^^^^^^^^^^^
Expand All @@ -52,11 +52,11 @@ reads hints about search locations from the following variables::

.. variable:: LZ4_INCLUDE_DIR

Path to LZ4 include directory with ``lz4.h`` header.
Path to LZ4 include directory with ``lz4.h`` header.

.. variable:: LZ4_LIBRARY

Path to LZ4 library to be linked.
Path to LZ4 library to be linked.

NOTE: The variables above should not usually be used in CMakeLists.txt files!

Expand All @@ -65,35 +65,35 @@ NOTE: The variables above should not usually be used in CMakeLists.txt files!
### Find library ##############################################################

if(NOT LZ4_LIBRARY)
find_library(LZ4_LIBRARY_RELEASE NAMES lz4)
find_library(LZ4_LIBRARY_DEBUG NAMES lz4d)
find_library(LZ4_LIBRARY_RELEASE NAMES lz4)
find_library(LZ4_LIBRARY_DEBUG NAMES lz4d)

include(SelectLibraryConfigurations)
select_library_configurations(LZ4)
include(SelectLibraryConfigurations)
select_library_configurations(LZ4)
else()
file(TO_CMAKE_PATH "${LZ4_LIBRARY}" LZ4_LIBRARY)
file(TO_CMAKE_PATH "${LZ4_LIBRARY}" LZ4_LIBRARY)
endif()

### Find include directory ####################################################
find_path(LZ4_INCLUDE_DIR NAMES lz4.h)

if(LZ4_INCLUDE_DIR AND EXISTS "${LZ4_INCLUDE_DIR}/lz4.h")
file(STRINGS "${LZ4_INCLUDE_DIR}/lz4.h" _lz4_h_contents
REGEX "#define LZ4_VERSION_[A-Z]+[ ]+[0-9]+")
string(REGEX REPLACE "#define LZ4_VERSION_MAJOR[ ]+([0-9]+).+" "\\1"
LZ4_VERSION_MAJOR "${_lz4_h_contents}")
string(REGEX REPLACE ".+#define LZ4_VERSION_MINOR[ ]+([0-9]+).+" "\\1"
LZ4_VERSION_MINOR "${_lz4_h_contents}")
string(REGEX REPLACE ".+#define LZ4_VERSION_RELEASE[ ]+([0-9]+).*" "\\1"
LZ4_VERSION_RELEASE "${_lz4_h_contents}")
set(LZ4_VERSION "${LZ4_VERSION_MAJOR}.${LZ4_VERSION_MINOR}.${LZ4_VERSION_RELEASE}")
unset(_lz4_h_contents)
file(STRINGS "${LZ4_INCLUDE_DIR}/lz4.h" _lz4_h_contents
REGEX "#define LZ4_VERSION_[A-Z]+[ ]+[0-9]+")
string(REGEX REPLACE "#define LZ4_VERSION_MAJOR[ ]+([0-9]+).+" "\\1"
LZ4_VERSION_MAJOR "${_lz4_h_contents}")
string(REGEX REPLACE ".+#define LZ4_VERSION_MINOR[ ]+([0-9]+).+" "\\1"
LZ4_VERSION_MINOR "${_lz4_h_contents}")
string(REGEX REPLACE ".+#define LZ4_VERSION_RELEASE[ ]+([0-9]+).*" "\\1"
LZ4_VERSION_RELEASE "${_lz4_h_contents}")
set(LZ4_VERSION "${LZ4_VERSION_MAJOR}.${LZ4_VERSION_MINOR}.${LZ4_VERSION_RELEASE}")
unset(_lz4_h_contents)
endif()

### Set result variables ######################################################
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(LZ4 DEFAULT_MSG
LZ4_LIBRARY LZ4_INCLUDE_DIR LZ4_VERSION)
LZ4_LIBRARY LZ4_INCLUDE_DIR LZ4_VERSION)

mark_as_advanced(LZ4_INCLUDE_DIR LZ4_LIBRARY)

Expand All @@ -102,29 +102,29 @@ set(LZ4_INCLUDE_DIRS ${LZ4_INCLUDE_DIR})

### Import targets ############################################################
if(LZ4_FOUND)
if(NOT TARGET lz4::lz4)
add_library(lz4::lz4 UNKNOWN IMPORTED)
set_target_properties(lz4::lz4 PROPERTIES
IMPORTED_LINK_INTERFACE_LANGUAGES "C"
INTERFACE_INCLUDE_DIRECTORIES "${LZ4_INCLUDE_DIR}")

if(LZ4_LIBRARY_RELEASE)
set_property(TARGET lz4::lz4 APPEND PROPERTY
IMPORTED_CONFIGURATIONS RELEASE)
set_target_properties(lz4::lz4 PROPERTIES
IMPORTED_LOCATION_RELEASE "${LZ4_LIBRARY_RELEASE}")
endif()

if(LZ4_LIBRARY_DEBUG)
set_property(TARGET lz4::lz4 APPEND PROPERTY
IMPORTED_CONFIGURATIONS DEBUG)
set_target_properties(lz4::lz4 PROPERTIES
IMPORTED_LOCATION_DEBUG "${LZ4_LIBRARY_DEBUG}")
endif()

if(NOT LZ4_LIBRARY_RELEASE AND NOT LZ4_LIBRARY_DEBUG)
set_property(TARGET lz4::lz4 APPEND PROPERTY
IMPORTED_LOCATION "${LZ4_LIBRARY}")
endif()
endif()
if(NOT TARGET lz4::lz4)
add_library(lz4::lz4 UNKNOWN IMPORTED)
set_target_properties(lz4::lz4 PROPERTIES
IMPORTED_LINK_INTERFACE_LANGUAGES "C"
INTERFACE_INCLUDE_DIRECTORIES "${LZ4_INCLUDE_DIR}")

if(LZ4_LIBRARY_RELEASE)
set_property(TARGET lz4::lz4 APPEND PROPERTY
IMPORTED_CONFIGURATIONS RELEASE)
set_target_properties(lz4::lz4 PROPERTIES
IMPORTED_LOCATION_RELEASE "${LZ4_LIBRARY_RELEASE}")
endif()

if(LZ4_LIBRARY_DEBUG)
set_property(TARGET lz4::lz4 APPEND PROPERTY
IMPORTED_CONFIGURATIONS DEBUG)
set_target_properties(lz4::lz4 PROPERTIES
IMPORTED_LOCATION_DEBUG "${LZ4_LIBRARY_DEBUG}")
endif()

if(NOT LZ4_LIBRARY_RELEASE AND NOT LZ4_LIBRARY_DEBUG)
set_property(TARGET lz4::lz4 APPEND PROPERTY
IMPORTED_LOCATION "${LZ4_LIBRARY}")
endif()
endif()
endif()
12 changes: 6 additions & 6 deletions cmake/modules/FindNUMA.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ find_path(NUMA_INCLUDE_DIR numa.h)

include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(
NUMA
REQUIRED_VARS NUMA_INCLUDE_DIR NUMA_LIBRARY
FAIL_MESSAGE "NUMA not found! Try to install numactl-devel package.")
NUMA
REQUIRED_VARS NUMA_INCLUDE_DIR NUMA_LIBRARY
FAIL_MESSAGE "NUMA not found! Try to install numactl-devel package.")

if(NUMA_FOUND AND NOT TARGET numa::numa)
add_library(numa::numa INTERFACE IMPORTED)
set_property(TARGET numa::numa PROPERTY INTERFACE_LINK_LIBRARIES "${NUMA_LIBRARY}")
set_property(TARGET numa::numa PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${NUMA_INCLUDE_DIR}")
add_library(numa::numa INTERFACE IMPORTED)
set_property(TARGET numa::numa PROPERTY INTERFACE_LINK_LIBRARIES "${NUMA_LIBRARY}")
set_property(TARGET numa::numa PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${NUMA_INCLUDE_DIR}")
endif()
Loading