diff options
| -rw-r--r-- | cmake/modules/FindWaylandpp.cmake | 9 | ||||
| -rw-r--r-- | tools/depends/target/waylandpp/Makefile | 3 |
2 files changed, 11 insertions, 1 deletions
diff --git a/cmake/modules/FindWaylandpp.cmake b/cmake/modules/FindWaylandpp.cmake index 3cfc282730..ba229d7ffc 100644 --- a/cmake/modules/FindWaylandpp.cmake +++ b/cmake/modules/FindWaylandpp.cmake @@ -11,12 +11,19 @@ # WAYLANDPP_SCANNER - path to wayland-scanner++ pkg_check_modules(PC_WAYLANDPP wayland-client++ wayland-egl++ wayland-cursor++ QUIET) -pkg_check_modules(PC_WAYLANDPP_SCANNER wayland-scanner++ QUIET) + if(PC_WAYLANDPP_FOUND) pkg_get_variable(PC_WAYLANDPP_PKGDATADIR wayland-client++ pkgdatadir) +else() + message(SEND_ERROR "wayland-client++ not found via pkg-config") endif() + +pkg_check_modules(PC_WAYLANDPP_SCANNER wayland-scanner++ QUIET) + if(PC_WAYLANDPP_SCANNER_FOUND) pkg_get_variable(PC_WAYLANDPP_SCANNER wayland-scanner++ wayland_scannerpp) +else() + message(SEND_ERROR "wayland-scanner++ not found via pkg-config") endif() find_path(WAYLANDPP_INCLUDE_DIR wayland-client.hpp PATHS ${PC_WAYLANDPP_INCLUDEDIR}) diff --git a/tools/depends/target/waylandpp/Makefile b/tools/depends/target/waylandpp/Makefile index b0ad4b2bf7..fac015603a 100644 --- a/tools/depends/target/waylandpp/Makefile +++ b/tools/depends/target/waylandpp/Makefile @@ -49,6 +49,9 @@ $(LIBDYLIB): $(PLATFORM) .installed-$(PLATFORM): $(LIBDYLIB) $(MAKE) -C $(BUILDDIR) install + + # We want to use the native wayland-scanner++ + ln -sf $(NATIVEPREFIX)/lib/pkgconfig/wayland-scanner++.pc $(PREFIX)/lib/pkgconfig/wayland-scanner++.pc touch $@ clean: |