diff --git a/CMakeLists.txt b/CMakeLists.txt index d520b8b728..0044b75888 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1832,6 +1832,7 @@ set(DOXYGEN_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) set(CFG_OUT_FILES doxygen.cfg + epan/wireshark.pc packaging/macosx/osx-app.sh packaging/macosx/osx-dmg.sh packaging/macosx/wireshark-app.dmgbuild @@ -1844,7 +1845,6 @@ set(CFG_OUT_FILES resources/libwsutil.rc resources/wireshark.exe.manifest resources/wireshark.rc - wireshark.pc ) 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) endif() -install( - FILES - "${CMAKE_BINARY_DIR}/wireshark.pc" - DESTINATION - ${CMAKE_INSTALL_LIBDIR}/pkgconfig - COMPONENT - "Development" - EXCLUDE_FROM_ALL -) - install( DIRECTORY ${INSTALL_DIRS} diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt index e751f5cbf5..58361d2330 100644 --- a/epan/CMakeLists.txt +++ b/epan/CMakeLists.txt @@ -397,6 +397,12 @@ install(FILES ${LIBWIRESHARK_PUBLIC_HEADERS} 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) target_link_libraries(exntest epan) set_target_properties(exntest PROPERTIES diff --git a/wireshark.pc.in b/epan/wireshark.pc.in similarity index 100% rename from wireshark.pc.in rename to epan/wireshark.pc.in