|
| 1 | +diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 2 | +index b9872dc..86cb5fb 100644 |
| 3 | +--- a/CMakeLists.txt |
| 4 | ++++ b/CMakeLists.txt |
| 5 | +@@ -109,10 +109,11 @@ if(ANDROID) |
| 6 | + # Android's stdlib ("bionic") doesn't need to be linked with (p)threads. |
| 7 | + set(LINK_LIBRARIES "${LINK_LIBRARIES}") |
| 8 | + else() |
| 9 | ++ set(THREADS_PREFER_PTHREAD_FLAG TRUE) |
| 10 | + find_package(Threads REQUIRED) |
| 11 | + set(LINK_LIBRARIES |
| 12 | + "${LINK_LIBRARIES}" |
| 13 | +- "Threads::Threads" |
| 14 | ++ "${CMAKE_THREAD_LIBS_INIT}" |
| 15 | + ) |
| 16 | + if(APPLE) |
| 17 | + list(APPEND LINK_LIBRARIES |
| 18 | +@@ -409,7 +410,7 @@ wtr_add_hdr_target( |
| 19 | + "wtr.hdr_watcher" |
| 20 | + "include/wtr/watcher.hpp" |
| 21 | + ) |
| 22 | +- |
| 23 | ++if(0) |
| 24 | + wtr_add_hdr_target( |
| 25 | + "watcher-c-hdr" |
| 26 | + "watcher-c/include/wtr/watcher-c.h" |
| 27 | +@@ -468,17 +469,17 @@ wtr_add_bin_target( |
| 28 | + "" |
| 29 | + "" |
| 30 | + ) |
| 31 | +- |
| 32 | ++endif() |
| 33 | + set(PC_WATCHER_LIBS_PRIVATE "${LINK_LIBRARIES}") |
| 34 | + set(PC_WATCHER_LIBDIR "${CMAKE_INSTALL_LIBDIR}") |
| 35 | +-set(PC_WATCHER_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}/wtr") |
| 36 | ++set(PC_WATCHER_INCLUDEDIR "${CMAKE_INSTALL_PREFIX}/include/wtr") |
| 37 | + wtr_add_pkg_config_target("watcher.pc" "watcher.pc.in") |
| 38 | +- |
| 39 | ++if(0) |
| 40 | + set(PC_LIBWATCHER_C_LIBS_PRIVATE "${LINK_LIBRARIES}") |
| 41 | + set(PC_LIBWATCHER_C_LIBDIR "${CMAKE_INSTALL_LIBDIR}") |
| 42 | + set(PC_LIBWATCHER_C_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}/wtr") |
| 43 | + wtr_add_pkg_config_target("watcher-c.pc" "watcher-c/watcher-c.pc.in") |
| 44 | +- |
| 45 | ++endif() |
| 46 | + if(BUILD_TESTING) |
| 47 | + message(STATUS "wtr.test_tool_test_all: Added (BUILD_TESTING=${BUILD_TESTING})") |
| 48 | + add_test( |
0 commit comments