diff options
| author | Lukas Rusak <lorusak@gmail.com> | 2023-05-11 19:42:22 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-11 19:42:22 -0700 |
| commit | 71ca1b8c5e410f5e689c1cfe9fc4d2e3fe949e7e (patch) | |
| tree | 7c79f5be3964a80b935d853018ecfc4ca76e73a8 /tools/depends/target/waylandpp | |
| parent | 0b9c667dd479fdc8e565aafe63bbb6d6828f63d7 (diff) | |
| parent | 002c2e37c8a91bb3a955462d170c998943d29350 (diff) | |
Merge pull request #22780 from lrusak/depends-native-fixes
Diffstat (limited to 'tools/depends/target/waylandpp')
| -rw-r--r-- | tools/depends/target/waylandpp/Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/depends/target/waylandpp/Makefile b/tools/depends/target/waylandpp/Makefile index 7eedeedb9e..4631a4668e 100644 --- a/tools/depends/target/waylandpp/Makefile +++ b/tools/depends/target/waylandpp/Makefile @@ -7,7 +7,6 @@ VERSION=0.2.8 SOURCE=$(LIBNAME)-$(VERSION) ARCHIVE=$(SOURCE).tar.gz SHA512=bf1b8a9e69b87547fc65989b9eaff88a442d8b2f01f5446cef960000b093390b1e557536837fbf38bb6d9a4f93e3985ea34c3253f94925b0f571b4606c980832 -include ../../download-files.include LIBDYLIB=$(PLATFORM)/build/libwayland-client++.so @@ -22,7 +21,7 @@ ifeq ($(PLATFORM),) ARCHIVE_TOOL := tar ARCHIVE_TOOL_FLAGS := --strip-components=1 -xf CMAKE := cmake - CMAKE_OPTIONS := -DCMAKE_INSTALL_PREFIX=$(PREFIX) -DBUILD_SCANNER=ON $(CMAKE_OPTIONS) + CMAKE_OPTIONS := -DCMAKE_INSTALL_PREFIX=$(PREFIX) -DCMAKE_INSTALL_LIBDIR=lib -DBUILD_SCANNER=ON $(CMAKE_OPTIONS) else # Building as part of depends DEPS += ../../Makefile.include @@ -32,6 +31,7 @@ endif CMAKE_OPTIONS := -DBUILD_DOCUMENTATION=OFF -DBUILD_LIBRARIES=ON -DBUILD_SHARED_LIBS=OFF -DBUILD_EXAMPLES=OFF $(CMAKE_OPTIONS) BUILDDIR = $(PLATFORM)/build +include ../../download-files.include all: .installed-$(PLATFORM) @@ -52,9 +52,10 @@ $(LIBDYLIB): $(PLATFORM) .installed-$(PLATFORM): $(LIBDYLIB) $(MAKE) -C $(BUILDDIR) install - +ifneq ($(PLATFORM), native) # We want to use the native wayland-scanner++ ln -sf $(NATIVEPREFIX)/lib/pkgconfig/wayland-scanner++.pc $(PREFIX)/lib/pkgconfig/wayland-scanner++.pc +endif touch $@ clean: |