From 7e10dcb1d4ebd329957e3f4454378870e9d1670d Mon Sep 17 00:00:00 2001 From: Cristian Adam Date: Tue, 18 Aug 2020 16:13:22 +0200 Subject: [PATCH] CMake Build: Add include guards for FindPPS.cmake and FindSlog2.cmake The CMake configure process fails without include guards for these two find modules on QNX. Task-number: QTBUG-83202 Change-Id: I3cc589f98bc3b6b22c401421927ee6dab2663fb7 Reviewed-by: Alexandru Croitor --- cmake/FindPPS.cmake | 4 ++++ cmake/FindSlog2.cmake | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/cmake/FindPPS.cmake b/cmake/FindPPS.cmake index c3360fa82c..fdcc87fa37 100644 --- a/cmake/FindPPS.cmake +++ b/cmake/FindPPS.cmake @@ -1,6 +1,10 @@ # Find the PPS library # Will make the target PPS::PPS available when found. +if(TARGET PPS::PPS) + set(PPS_FOUND TRUE) + return() +endif() find_library(PPS_LIBRARY NAMES "pps") find_path(PPS_INCLUDE_DIR NAMES "sys/pps.h" DOC "The PPS Include path") diff --git a/cmake/FindSlog2.cmake b/cmake/FindSlog2.cmake index 807ab6b12a..1e3e264816 100644 --- a/cmake/FindSlog2.cmake +++ b/cmake/FindSlog2.cmake @@ -1,6 +1,10 @@ # Find the Slog2 library # Will make the target Slog2::Slog2 available when found. +if(TARGET Slog2::Slog2) + set(Slog2_FOUND TRUE) + return() +endif() find_library(Slog2_LIBRARY NAMES "slog2") find_path(Slog2_INCLUDE_DIR NAMES "sys/slog2.h" DOC "The Slog2 Include path")