Commit 06dbdd27 authored by Casey Goodlett's avatar Casey Goodlett
Browse files

Install pcap as an install rule instead of via bundle.

This is needed to support execution in project directory.
parent 5a8d698a
message("Installing pcap")
file(INSTALL ${PCAP_LIBRARY} ${PACKET_LIBRARY}
DESTINATION ${PCAP_INSTALL_DIR})
message("Done pcap install")
\ No newline at end of file
# Simply use WinPcap development files from their webside.
add_external_project(pcap
BUILD_IN_SOURCE 1
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
INSTALL_COMMAND ""
)
if(CMAKE_CL_64)
set(wpcap_library_dir ${SuperBuild_BINARY_DIR}/pcap/src/pcap/Lib/x64)
else()
set(wpcap_library_dir ${SuperBuild_BINARY_DIR}/pcap/src/pcap/Lib)
endif()
add_extra_cmake_args(
-DPCAP_INCLUDE_DIR:PATH=${SuperBuild_BINARY_DIR}/pcap/src/pcap/Include
-DPCAP_LIBRARY:FILEPATH=${wpcap_library_dir}/wpcap.lib)
if(CMAKE_CL_64)
set(wpcap_library_dir ${SuperBuild_BINARY_DIR}/pcap/src/pcap/Lib/x64)
else()
set(wpcap_library_dir ${SuperBuild_BINARY_DIR}/pcap/src/pcap/Lib)
endif()
# Simply use WinPcap development files from their webside.
add_external_project(pcap
BUILD_IN_SOURCE 1
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
INSTALL_COMMAND ${CMAKE_COMMAND}
-DPCAP_LIBRARY:FILEPATH=${wpcap_library_dir}/wpcap.dll
-DPACKET_LIBRARY:FILEPATH=${wpcap_library_dir}/packet.dll
-DPCAP_INSTALL_DIR:PATH=<INSTALL_DIR>/bin
-P ${SuperBuild_PROJECTS_DIR}/win32/installpcap.cmake
)
add_extra_cmake_args(
-DPCAP_INCLUDE_DIR:PATH=${SuperBuild_BINARY_DIR}/pcap/src/pcap/Include
-DPCAP_LIBRARY:FILEPATH=${wpcap_library_dir}/wpcap.lib)
......@@ -57,10 +57,6 @@ install(FILES "${install_location}/share/HDL-32.xml" "${install_location}/share/
DESTINATION "share"
COMPONENT ${AppName})
install(FILES "${wpcap_library_dir}/wpcap.dll" "${wpcap_library_dir}/Packet.dll"
DESTINATION "bin"
COMPONENT ${AppName})
install(FILES "${VeloViewSuperBuild_SOURCE_DIR}/../Documentation/VeloView_Developer_Guide.pdf"
DESTINATION "doc"
COMPONENT ${AppName})
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment