Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Install to the libwpe backends directory #99

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Install to the libwpe backends directory #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ set_target_properties(WPEBackend-fdo

install(
TARGETS WPEBackend-fdo
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
LIBRARY DESTINATION ${WPE_BACKENDS_DIR}
)
install(
FILES ${WPEBACKEND_FDO_PUBLIC_HEADERS}
Expand Down
7 changes: 5 additions & 2 deletions cmake/FindWPE.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@
# WPE_FOUND - system has WPE.
# WPE_INCLUDE_DIRS - the WPE include directories
# WPE_LIBRARIES - link these to use WPE.
# WPE_BACKENDS_DIR - location where to install WPE backends.
#
# Copyright (C) 2016 Igalia S.L.
# Copyright (C) 2020, 2016 Igalia S.L.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
Expand All @@ -30,6 +31,7 @@

find_package(PkgConfig)
pkg_check_modules(WPE IMPORTED_TARGET wpe-1.0)
pkg_get_variable(WPE_BACKENDS_DIR wpe-1.0 backendsdir)

find_path(WPE_INCLUDE_DIR
NAMES wpe/wpe.h
Expand Down Expand Up @@ -59,4 +61,5 @@ if (WPE_LIBRARY AND NOT TARGET WPE::libwpe)
endif ()

include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(WPE REQUIRED_VARS WPE_LIBRARY WPE_INCLUDE_DIR)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(WPE
REQUIRED_VARS WPE_LIBRARY WPE_INCLUDE_DIR WPE_BACKENDS_DIR)
2 changes: 1 addition & 1 deletion wpebackend-fdo.pc.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ Description: The WPEBackend-fdo library
Version: @PROJECT_VERSION@
Requires: wpe-1.0
Cflags: -I${includedir}/wpe-fdo-@WPEBACKEND_FDO_API_VERSION@
Libs: -L${libdir} -lWPEBackend-fdo-@WPEBACKEND_FDO_API_VERSION@
Libs: -L@WPE_BACKENDS_DIR@ -lWPEBackend-fdo-@WPEBACKEND_FDO_API_VERSION@