| 1 | Upstream-status: <https://github.com/e-dant/watcher/pull/126>
|
| 2 |
|
| 3 | diff --git a/CMakeLists.txt b/CMakeLists.txt
|
| 4 | index 953f2c0..ecea90c 100644
|
| 5 | |
| 6 | |
| 7 | @@ -115,10 +115,7 @@ if(ANDROID)
|
| 8 | set(LINK_LIBRARIES "${LINK_LIBRARIES}")
|
| 9 | else()
|
| 10 | find_package(Threads REQUIRED)
|
| 11 | - set(LINK_LIBRARIES
|
| 12 | - "${LINK_LIBRARIES}"
|
| 13 | - "Threads::Threads"
|
| 14 | - )
|
| 15 | + list(APPEND LINK_LIBRARIES "Threads::Threads")
|
| 16 | if(APPLE)
|
| 17 | list(APPEND LINK_LIBRARIES
|
| 18 | "-framework CoreFoundation"
|
| 19 | @@ -483,14 +480,15 @@ wtr_add_bin_target(
|
| 20 | ""
|
| 21 | ""
|
| 22 | )
|
| 23 | -
|
| 24 | -set(PC_WATCHER_LIBS_PRIVATE "${LINK_LIBRARIES}")
|
| 25 | +set(PC_WATCHER_PREFIX "${CMAKE_INSTALL_PREFIX}")
|
| 26 | set(PC_WATCHER_LIBDIR "${CMAKE_INSTALL_LIBDIR}")
|
| 27 | +set(PC_WATCHER_LIBS_PRIVATE "${LINK_LIBRARIES}")
|
| 28 | set(PC_WATCHER_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}/wtr")
|
| 29 | wtr_add_pkg_config_target("watcher.pc" "watcher.pc.in")
|
| 30 |
|
| 31 | -set(PC_LIBWATCHER_C_LIBS_PRIVATE "${LINK_LIBRARIES}")
|
| 32 | +set(PC_LIBWATCHER_C_PREFIX "${CMAKE_INSTALL_PREFIX}")
|
| 33 | set(PC_LIBWATCHER_C_LIBDIR "${CMAKE_INSTALL_LIBDIR}")
|
| 34 | +set(PC_LIBWATCHER_C_LIBS_PRIVATE "${LINK_LIBRARIES}")
|
| 35 | set(PC_LIBWATCHER_C_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}/wtr")
|
| 36 | wtr_add_pkg_config_target("watcher-c.pc" "watcher-c/watcher-c.pc.in")
|
| 37 |
|
| 38 | diff --git a/watcher-c/watcher-c.pc.in b/watcher-c/watcher-c.pc.in
|
| 39 | index f48d927..9200b73 100644
|
| 40 | |
| 41 | |
| 42 | @@ -1,14 +1,12 @@
|
| 43 | prefix=@PC_LIBWATCHER_C_PREFIX@
|
| 44 | exec_prefix=${prefix}
|
| 45 | -libdir=@PC_LIBWATCHER_C_LIBDIR@
|
| 46 | -includedir=@PC_LIBWATCHER_C_INCLUDEDIR@
|
| 47 | +libdir=${exec_prefix}/@PC_LIBWATCHER_C_LIBDIR@
|
| 48 | +includedir=${prefix}/@PC_LIBWATCHER_C_INCLUDEDIR@
|
| 49 |
|
| 50 | Name: libwatcher-c
|
| 51 | Description: @PROJECT_DESCRIPTION@
|
| 52 | URL: @PROJECT_HOMEPAGE_URL@
|
| 53 | Version: @PROJECT_VERSION@
|
| 54 | -Requires:
|
| 55 | -Conflicts:
|
| 56 | Libs: -L${libdir} -lwatcher-c
|
| 57 | Libs.private: @PC_LIBWATCHER_C_LIBS_PRIVATE@
|
| 58 | Cflags: -I${includedir}
|
| 59 | diff --git a/watcher.pc.in b/watcher.pc.in
|
| 60 | index 14d3296..198cdcb 100644
|
| 61 | |
| 62 | |
| 63 | @@ -1,14 +1,11 @@
|
| 64 | prefix=@PC_WATCHER_PREFIX@
|
| 65 | exec_prefix=${prefix}
|
| 66 | -libdir=@PC_WATCHER_LIBDIR@
|
| 67 | -includedir=@PC_WATCHER_INCLUDEDIR@
|
| 68 | +libdir=${exec_prefix}/@PC_WATCHER_LIBDIR@
|
| 69 | +includedir=${prefix}/@PC_WATCHER_INCLUDEDIR@
|
| 70 |
|
| 71 | Name: watcher
|
| 72 | Description: @PROJECT_DESCRIPTION@
|
| 73 | URL: @PROJECT_HOMEPAGE_URL@
|
| 74 | Version: @PROJECT_VERSION@
|
| 75 | -Requires:
|
| 76 | -Conflicts:
|
| 77 | -Libs:
|
| 78 | Libs.private: @PC_WATCHER_LIBS_PRIVATE@
|
| 79 | Cflags: -I${includedir}
|