diff --git a/cmake/FindEGL.cmake b/cmake/FindEGL.cmake index 160009277..1ac539dc1 100644 --- a/cmake/FindEGL.cmake +++ b/cmake/FindEGL.cmake @@ -36,7 +36,7 @@ #============================================================================= # Copyright 2014 Alex Merry # Copyright 2014 Martin Gräßlin -# Copyright 2019 Ryan Pavlik +# Copyright 2019, 2021 Ryan Pavlik # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -67,8 +67,12 @@ include(CMakePushCheckState) # Use pkg-config to get the directories and then use these values # in the FIND_PATH() and FIND_LIBRARY() calls -find_package(PkgConfig) -pkg_check_modules(PKG_EGL QUIET egl) +if(NOT ANDROID) + find_package(PkgConfig QUIET) + if(PKGCONFIG_FOUND) + pkg_check_modules(PKG_EGL QUIET egl) + endif() +endif() set(EGL_DEFINITIONS ${PKG_EGL_CFLAGS_OTHER}) diff --git a/cmake/FindHIDAPI.cmake b/cmake/FindHIDAPI.cmake index 202194497..3d97b8113 100644 --- a/cmake/FindHIDAPI.cmake +++ b/cmake/FindHIDAPI.cmake @@ -40,11 +40,11 @@ # ``HIDAPI_LIBRARIES`` # # Original Author: -# 2009-2010, 2019 Ryan Pavlik +# 2009-2010, 2019, 2021 Ryan Pavlik # http://academic.cleardefinition.com # # Copyright Iowa State University 2009-2010. -# Copyright Collabora, Ltd. 2019. +# Copyright Collabora, Ltd. 2019, 2021. # SPDX-License-Identifier: BSL-1.0 # Distributed under the Boost Software License, Version 1.0. # (See accompanying file LICENSE_1_0.txt or copy at @@ -72,17 +72,19 @@ if(NOT HIDAPI_FIND_COMPONENTS) endif() # Ask pkg-config for hints -find_package(PkgConfig QUIET) -if(PKG_CONFIG_FOUND) - set(_old_prefix_path "${CMAKE_PREFIX_PATH}") - # So pkg-config uses HIDAPI_ROOT_DIR too. - if(HIDAPI_ROOT_DIR) - list(APPEND CMAKE_PREFIX_PATH ${HIDAPI_ROOT_DIR}) +if(NOT ANDROID) + find_package(PkgConfig QUIET) + if(PKG_CONFIG_FOUND) + set(_old_prefix_path "${CMAKE_PREFIX_PATH}") + # So pkg-config uses HIDAPI_ROOT_DIR too. + if(HIDAPI_ROOT_DIR) + list(APPEND CMAKE_PREFIX_PATH ${HIDAPI_ROOT_DIR}) + endif() + pkg_check_modules(PC_HIDAPI_LIBUSB QUIET hidapi-libusb) + pkg_check_modules(PC_HIDAPI_HIDRAW QUIET hidapi-hidraw) + # Restore + set(CMAKE_PREFIX_PATH "${_old_prefix_path}") endif() - pkg_check_modules(PC_HIDAPI_LIBUSB QUIET hidapi-libusb) - pkg_check_modules(PC_HIDAPI_HIDRAW QUIET hidapi-hidraw) - # Restore - set(CMAKE_PREFIX_PATH "${_old_prefix_path}") endif() # Actually search diff --git a/cmake/FindLibcheck.cmake b/cmake/FindLibcheck.cmake index af1d3af56..25b583c21 100644 --- a/cmake/FindLibcheck.cmake +++ b/cmake/FindLibcheck.cmake @@ -1,11 +1,11 @@ -# Copyright 2019 Collabora, Ltd. +# Copyright 2019, 2021 Collabora, Ltd. # SPDX-License-Identifier: BSL-1.0 # Distributed under the Boost Software License, Version 1.0. # (See accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt) # # Original Author: -# 2019 Ryan Pavlik +# 2019, 2021 Ryan Pavlik #.rst: # FindCheck @@ -36,17 +36,20 @@ set(LIBCHECK_ROOT_DIR "${LIBCHECK_ROOT_DIR}" CACHE PATH "Root to search for libcheck") -find_package(PkgConfig QUIET) -if(PKG_CONFIG_FOUND) - set(_old_prefix_path "${CMAKE_PREFIX_PATH}") - # So pkg-config uses LIBCHECK_ROOT_DIR too. - if(LIBCHECK_ROOT_DIR) - list(APPEND CMAKE_PREFIX_PATH ${LIBCHECK_ROOT_DIR}) +if(NOT ANDROID) + find_package(PkgConfig QUIET) + if(PKG_CONFIG_FOUND) + set(_old_prefix_path "${CMAKE_PREFIX_PATH}") + # So pkg-config uses LIBCHECK_ROOT_DIR too. + if(LIBCHECK_ROOT_DIR) + list(APPEND CMAKE_PREFIX_PATH ${LIBCHECK_ROOT_DIR}) + endif() + pkg_check_modules(PC_LIBCHECK QUIET check) + # Restore + set(CMAKE_PREFIX_PATH "${_old_prefix_path}") endif() - pkg_check_modules(PC_LIBCHECK QUIET check) - # Restore - set(CMAKE_PREFIX_PATH "${_old_prefix_path}") endif() + find_path( LIBCHECK_INCLUDE_DIR NAMES check.h diff --git a/cmake/FindLibusb1.cmake b/cmake/FindLibusb1.cmake index f1c63e324..ea5aae1b4 100644 --- a/cmake/FindLibusb1.cmake +++ b/cmake/FindLibusb1.cmake @@ -14,11 +14,11 @@ # FindPackageHandleStandardArgs (known included with CMake >=2.6.2) # # Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com -# Iowa State University HCI Graduate Program/VRAC +# 2009-2010, 2021 Ryan Pavlik # # Copyright Iowa State University 2009-2010. +# Copyright Collabora, Ltd 2021. +# # SPDX-License-Identifier: BSL-1.0 # Distributed under the Boost Software License, Version 1.0. # (See accompanying file LICENSE_1_0.txt or copy at @@ -47,9 +47,11 @@ if(WIN32) endif() else() set(_lib_suffixes) - find_package(PkgConfig QUIET) - if(PKG_CONFIG_FOUND) - pkg_check_modules(PC_LIBUSB1 libusb-1.0) + if(NOT ANDROID) + find_package(PkgConfig QUIET) + if(PKG_CONFIG_FOUND) + pkg_check_modules(PC_LIBUSB1 QUIET libusb-1.0) + endif() endif() endif() diff --git a/cmake/FindOpenGLES.cmake b/cmake/FindOpenGLES.cmake index fc8aeb56c..b16a1d33a 100644 --- a/cmake/FindOpenGLES.cmake +++ b/cmake/FindOpenGLES.cmake @@ -1,11 +1,11 @@ -# Copyright 2020 Collabora, Ltd. +# Copyright 2020-2021 Collabora, Ltd. # SPDX-License-Identifier: BSL-1.0 # Distributed under the Boost Software License, Version 1.0. # (See accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt) # # Original Author: -# 2020 Ryan Pavlik +# 2020-2021 Ryan Pavlik #[[.rst: FindOpenGLES @@ -53,18 +53,22 @@ set(OpenGLES_ROOT_DIR if(NOT OpenGLES_FIND_COMPONENTS) set(OpenGLES_FIND_COMPONENTS V2) endif() -find_package(PkgConfig QUIET) -if(PKG_CONFIG_FOUND) - set(_old_prefix_path "${CMAKE_PREFIX_PATH}") - # So pkg-config uses OpenGLES_ROOT_DIR too. - if(OpenGLES_ROOT_DIR) - list(APPEND CMAKE_PREFIX_PATH ${OpenGLES_ROOT_DIR}) + +if(NOT ANDROID) + find_package(PkgConfig QUIET) + if(PKG_CONFIG_FOUND) + set(_old_prefix_path "${CMAKE_PREFIX_PATH}") + # So pkg-config uses OpenGLES_ROOT_DIR too. + if(OpenGLES_ROOT_DIR) + list(APPEND CMAKE_PREFIX_PATH ${OpenGLES_ROOT_DIR}) + endif() + pkg_check_modules(PC_glesv1_cm QUIET glesv1_cm) + pkg_check_modules(PC_glesv2 QUIET glesv2) + # Restore + set(CMAKE_PREFIX_PATH "${_old_prefix_path}") endif() - pkg_check_modules(PC_glesv1_cm QUIET glesv1_cm) - pkg_check_modules(PC_glesv2 QUIET glesv2) - # Restore - set(CMAKE_PREFIX_PATH "${_old_prefix_path}") endif() + find_path( OpenGLES_V1_INCLUDE_DIR NAMES GLES/gl.h diff --git a/cmake/FindOpenHMD.cmake b/cmake/FindOpenHMD.cmake index 556cc7879..ea36f2e91 100644 --- a/cmake/FindOpenHMD.cmake +++ b/cmake/FindOpenHMD.cmake @@ -1,11 +1,11 @@ -# Copyright 2019 Collabora, Ltd. +# Copyright 2019, 2021 Collabora, Ltd. # SPDX-License-Identifier: BSL-1.0 # Distributed under the Boost Software License, Version 1.0. # (See accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt) # # Original Author: -# 2019 Ryan Pavlik +# 2019, 2021 Ryan Pavlik #.rst: # FindOpenHMD @@ -34,16 +34,18 @@ set(OPENHMD_ROOT_DIR "${OPENHMD_ROOT_DIR}" CACHE PATH "Root to search for OpenHMD") -find_package(PkgConfig QUIET) -if(PKG_CONFIG_FOUND) - set(_old_prefix_path "${CMAKE_PREFIX_PATH}") - # So pkg-config uses OPENHMD_ROOT_DIR too. - if(OPENHMD_ROOT_DIR) - list(APPEND CMAKE_PREFIX_PATH ${OPENHMD_ROOT_DIR}) +if(NOT ANDROID) + find_package(PkgConfig QUIET) + if(PKG_CONFIG_FOUND) + set(_old_prefix_path "${CMAKE_PREFIX_PATH}") + # So pkg-config uses OPENHMD_ROOT_DIR too. + if(OPENHMD_ROOT_DIR) + list(APPEND CMAKE_PREFIX_PATH ${OPENHMD_ROOT_DIR}) + endif() + pkg_check_modules(PC_OPENHMD QUIET openhmd) + # Restore + set(CMAKE_PREFIX_PATH "${_old_prefix_path}") endif() - pkg_check_modules(PC_OPENHMD QUIET openhmd) - # Restore - set(CMAKE_PREFIX_PATH "${_old_prefix_path}") endif() find_path( diff --git a/cmake/FindSystemd.cmake b/cmake/FindSystemd.cmake index 2580d848e..b41b37169 100644 --- a/cmake/FindSystemd.cmake +++ b/cmake/FindSystemd.cmake @@ -15,7 +15,7 @@ # #============================================================================= # Copyright (c) 2015 Jari Vetoniemi -# Copyright (c) 2020 Collabora, Ltd. +# Copyright (c) 2020-2021 Collabora, Ltd. # # Distributed under the OSI-approved BSD License (the "License"); # @@ -31,8 +31,13 @@ set_package_properties( URL "http://freedesktop.org/wiki/Software/systemd/" DESCRIPTION "System and Service Manager") -find_package(PkgConfig) -pkg_check_modules(PC_SYSTEMD QUIET libsystemd) +if(NOT ANDROID) + find_package(PkgConfig QUIET) + if(PKG_CONFIG_FOUND) + pkg_check_modules(PC_SYSTEMD QUIET libsystemd) + endif() +endif() + find_library( SYSTEMD_LIBRARY NAMES systemd diff --git a/cmake/Findudev.cmake b/cmake/Findudev.cmake index ef8cea39c..6ad89ea54 100644 --- a/cmake/Findudev.cmake +++ b/cmake/Findudev.cmake @@ -13,8 +13,13 @@ # Requires these CMake modules: # FindPackageHandleStandardArgs (known included with CMake >=2.6.2) # -# Original Author: -# Copyright 2014 Kevin M. Godby +# Original Authors: +# 2014 Kevin M. Godby +# 2021 Ryan Pavlik +# +# Copyright 2014, Kevin M. Godby +# Copyright 2021, Collabora, Ltd. +# # SPDX-License-Identifier: BSL-1.0 # # Distributed under the Boost Software License, Version 1.0. @@ -27,9 +32,11 @@ set(UDEV_ROOT_DIR PATH "Directory to search for udev") -find_package(PkgConfig QUIET) -if(PKG_CONFIG_FOUND) - pkg_check_modules(PC_LIBUDEV libudev) +if(NOT ANDROID) + find_package(PkgConfig QUIET) + if(PKG_CONFIG_FOUND) + pkg_check_modules(PC_LIBUDEV QUIET libudev) + endif() endif() find_library(UDEV_LIBRARY