pycapng 0.4__tar.gz → 0.6__tar.gz

{pycapng-0.4 → pycapng-0.6}/CMakeLists.txt

@@ -37,9 +37,12 @@ install(FILES "${libpcapng_BINARY_DIR}/libpcapng.pc" DESTINATION "${CMAKE_INSTAL
 
 include_directories(AFTER ${libpcapng_SOURCE_DIR}/lib/include)
 
-find_package(Python REQUIRED COMPONENTS Interpreter Development.Module)
-set(PYBIND11_FINDPYTHON ON)
-find_package(pybind11 CONFIG REQUIRED)
+option(LIBPCAPNG_BINDINGS "Build the Python (pybind11) bindings" ON)
+if(LIBPCAPNG_BINDINGS)
+  find_package(Python REQUIRED COMPONENTS Interpreter Development.Module)
+  set(PYBIND11_FINDPYTHON ON)
+  find_package(pybind11 CONFIG REQUIRED)
+endif()
 
 # <pybind11>
 # execute_process (
@@ -61,17 +64,18 @@ find_package(pybind11 CONFIG REQUIRED)
 # endif()
 
 set(LIBPCAPNG_INCLUDE_DIRS "${libpcapng_SOURCE_DIR}/lib/include/")
-if (LINUX)
-  set(LIBPCAPNG_LIBRARY "${libpcapng_BINARY_DIR}/lib/libpcapng.so")
-endif()
+# Link by target name: a raw path would give make no pcapng -> consumer edge,
+# so parallel builds can start lib/tests before the library exists.
+set(LIBPCAPNG_LIBRARY pcapng)
 if (APPLE)
   set(CMAKE_MACOSX_RPATH ON)
-  set(LIBPCAPNG_LIBRARY "${libpcapng_BINARY_DIR}/lib/libpcapng.dylib")
 endif()
 
 add_definitions(-g)
 
 add_subdirectory(lib)
 add_subdirectory(bin)
-add_subdirectory(bindings)
+if(LIBPCAPNG_BINDINGS)
+  add_subdirectory(bindings)
+endif()
 

{pycapng-0.4 → pycapng-0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pycapng
-Version: 0.4
+Version: 0.6
 Summary: Python bindings for libpcapng — read/write pcapng files and live packet capture
 Keywords: pcapng,pcap,packet-capture,network,packet,wireshark
 Author-Email: Seb Tricaud <sebastien.tricaud@proton.me>

{pycapng-0.4 → pycapng-0.6}/lib/CMakeLists.txt

@@ -79,7 +79,11 @@ set_target_properties(pcapng_static PROPERTIES SOVERSION 1 POSITION_INDEPENDENT_
 
 install(TARGETS pcapng LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} COMPONENT Libraries)
 install(TARGETS pcapng_static LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} COMPONENT Libraries)
-install(FILES ${LIBPCAPNG_HEADERS} DESTINATION include/libpcapng COMPONENT Headers)
+# Install the header tree preserving the protocols/ subdirectory, so consumers
+# that include the umbrella <libpcapng/libpcapng.h> (which pulls protocols/*.h)
+# build against an installed copy.
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/libpcapng
+        DESTINATION include COMPONENT Headers FILES_MATCHING PATTERN "*.h")
 
 add_subdirectory(tests)