-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Only install .pc files for which we build a .so.
Many .so files are not built on arm64, but currently we install the .pc files anyway. Fix by including the .pc files in the ARM64 conditional.
- Loading branch information
1 parent
9f3f905
commit 1071dad
Showing
2 changed files
with
28 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
index fe67fc8..8393a8b 100644 | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -11,9 +11,11 @@ SET(PROJECT_APIVER "${PROJECT_VER}") | ||
if(ARM64) | ||
set(BUILD_MMAL FALSE) | ||
set(BUILD_MMAL_APPS FALSE) | ||
+ set(PKGCONFFILES bcm_host.pc) | ||
else() | ||
set(BUILD_MMAL TRUE) | ||
set(BUILD_MMAL_APPS TRUE) | ||
+ set(PKGCONFFILES bcm_host.pc brcmegl.pc brcmglesv2.pc brcmvg.pc vcsm.pc mmal.pc) | ||
endif() | ||
set(vmcs_root ${PROJECT_SOURCE_DIR}) | ||
get_filename_component(VIDEOCORE_ROOT . ABSOLUTE) | ||
@@ -122,7 +124,7 @@ include_directories("${PROJECT_BINARY_DIR}") | ||
include(FindPkgConfig QUIET) | ||
if(PKG_CONFIG_FOUND) | ||
# Produce a pkg-config file | ||
- foreach(PCFILE bcm_host.pc brcmegl.pc brcmglesv2.pc brcmvg.pc vcsm.pc mmal.pc) | ||
+ foreach(PCFILE IN LISTS PKGCONFFILES) | ||
configure_file("pkgconfig/${PCFILE}.in" "${PCFILE}" @ONLY) | ||
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PCFILE}" | ||
DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters