CMake: Move wireshark.pc.in
Move the libwireshark pkgconfig file to the libwireshark directory (epan).
This commit is contained in:
parent
64b3136321
commit
04e12ad947
|
@ -1832,6 +1832,7 @@ set(DOXYGEN_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
|
||||||
|
|
||||||
set(CFG_OUT_FILES
|
set(CFG_OUT_FILES
|
||||||
doxygen.cfg
|
doxygen.cfg
|
||||||
|
epan/wireshark.pc
|
||||||
packaging/macosx/osx-app.sh
|
packaging/macosx/osx-app.sh
|
||||||
packaging/macosx/osx-dmg.sh
|
packaging/macosx/osx-dmg.sh
|
||||||
packaging/macosx/wireshark-app.dmgbuild
|
packaging/macosx/wireshark-app.dmgbuild
|
||||||
|
@ -1844,7 +1845,6 @@ set(CFG_OUT_FILES
|
||||||
resources/libwsutil.rc
|
resources/libwsutil.rc
|
||||||
resources/wireshark.exe.manifest
|
resources/wireshark.exe.manifest
|
||||||
resources/wireshark.rc
|
resources/wireshark.rc
|
||||||
wireshark.pc
|
|
||||||
)
|
)
|
||||||
|
|
||||||
if(BUILD_logray)
|
if(BUILD_logray)
|
||||||
|
@ -4052,16 +4052,6 @@ if(BUILD_logray AND QT_FOUND AND NOT APPLE AND (NOT WIN32 OR USE_MSYSTEM))
|
||||||
RENAME org.wireshark.Logray.svg)
|
RENAME org.wireshark.Logray.svg)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
install(
|
|
||||||
FILES
|
|
||||||
"${CMAKE_BINARY_DIR}/wireshark.pc"
|
|
||||||
DESTINATION
|
|
||||||
${CMAKE_INSTALL_LIBDIR}/pkgconfig
|
|
||||||
COMPONENT
|
|
||||||
"Development"
|
|
||||||
EXCLUDE_FROM_ALL
|
|
||||||
)
|
|
||||||
|
|
||||||
install(
|
install(
|
||||||
DIRECTORY
|
DIRECTORY
|
||||||
${INSTALL_DIRS}
|
${INSTALL_DIRS}
|
||||||
|
|
|
@ -397,6 +397,12 @@ install(FILES ${LIBWIRESHARK_PUBLIC_HEADERS}
|
||||||
EXCLUDE_FROM_ALL
|
EXCLUDE_FROM_ALL
|
||||||
)
|
)
|
||||||
|
|
||||||
|
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/wireshark.pc"
|
||||||
|
DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
|
||||||
|
COMPONENT "Development"
|
||||||
|
EXCLUDE_FROM_ALL
|
||||||
|
)
|
||||||
|
|
||||||
add_executable(exntest EXCLUDE_FROM_ALL exntest.c except.c)
|
add_executable(exntest EXCLUDE_FROM_ALL exntest.c except.c)
|
||||||
target_link_libraries(exntest epan)
|
target_link_libraries(exntest epan)
|
||||||
set_target_properties(exntest PROPERTIES
|
set_target_properties(exntest PROPERTIES
|
||||||
|
|
Loading…
Reference in New Issue