Fix compilation when using system dependencies.
This was due to an incomplete renaming of aemu targets.
Also add missing `gfxstream-snapshot.headers` causing include failure.
Change-Id: I25765ccbf4731d3e655f619a34de8316f08cdde3
diff --git a/gl-host-common/CMakeLists.txt b/gl-host-common/CMakeLists.txt
index 5238e31..6b63800 100644
--- a/gl-host-common/CMakeLists.txt
+++ b/gl-host-common/CMakeLists.txt
@@ -7,6 +7,7 @@
INTERFACE
aemu-host-common.headers
aemu-base.headers
+ gfxstream-snapshot.headers
gfxstream_egl_headers)
if (APPLE)
diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt
index 26d0d6a..5537c7f 100644
--- a/third-party/CMakeLists.txt
+++ b/third-party/CMakeLists.txt
@@ -91,11 +91,11 @@
find_package(PkgConfig REQUIRED)
set(AEMU_PC_FILES
aemu_base
- logging_base
+ aemu_logging
aemu_host_common
aemu_base_testing_support
aemu_host_common_testing_support
- gfxstream_snapshot)
+ aemu_snapshot)
foreach(PC_FILE IN LISTS AEMU_PC_FILES)
pkg_search_module(${PC_FILE} REQUIRED IMPORTED_TARGET GLOBAL ${PC_FILE}>=0.0.0)
endforeach()
@@ -108,11 +108,11 @@
target_link_libraries(aemu-host-common.headers INTERFACE renderdoc gfxstream_vulkan_headers)
add_library(gfxstream-snapshot.headers INTERFACE)
- target_include_directories(gfxstream-snapshot.headers INTERFACE ${gfxstream_snapshot_INCLUDE_DIRS})
- add_library(gfxstream-snapshot ALIAS PkgConfig::gfxstream_snapshot)
+ target_include_directories(gfxstream-snapshot.headers INTERFACE ${aemu_snapshot_INCLUDE_DIRS})
+ add_library(gfxstream-snapshot ALIAS PkgConfig::aemu_snapshot)
add_library(logging-base INTERFACE)
- target_link_libraries(logging-base INTERFACE PkgConfig::logging_base)
+ target_link_libraries(logging-base INTERFACE PkgConfig::aemu_logging)
if (WIN32)
set(aemu-base-platform-deps Shlwapi)
@@ -151,7 +151,7 @@
PkgConfig::aemu_host_common_testing_support
PkgConfig::aemu_host_common
PkgConfig::aemu_base
- PkgConfig::logging_base
+ PkgConfig::aemu_logging
gmock
gtest)
if(TARGET lz4_static)
