From bd90347fcebe1f9ed5cd3add594f2bec1f4474fd Mon Sep 17 00:00:00 2001 From: Ryan Pavlik <ryan.pavlik@collabora.com> Date: Wed, 4 May 2022 12:49:44 -0500 Subject: [PATCH] cmake: Clean up build --- CMakeLists.txt | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 95b4ae68a..1dddb4d32 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -102,10 +102,15 @@ if(NOT WIN32) find_package(Percetto MODULE) find_package(Systemd MODULE) find_package(OpenGLES MODULE COMPONENTS V3) + find_library(RT_LIBRARY rt) endif() -if(NOT ANDROID) +if(NOT ANDROID AND NOT WIN32) find_package(PkgConfig MODULE) endif() +if(ANDROID) + find_library(ANDROID_LIBRARY android) + find_library(ANDROID_LOG_LIBRARY log) +endif() if(WIN32) find_package(wil CONFIG) find_library(D3D11_LIBRARY d3d11) @@ -163,13 +168,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux") pkg_check_modules(SURVIVE IMPORTED_TARGET survive) endif() -find_library(RT_LIBRARY rt) - -if(ANDROID) - find_library(ANDROID_LIBRARY android) - find_library(ANDROID_LOG_LIBRARY log) -endif() - # Find a external SLAM implementation set(EXTERNAL_SLAM_SYSTEMS kimera_vio basalt) foreach(slam_system IN LISTS EXTERNAL_SLAM_SYSTEMS)