From 371631dac44af363c13f832b7709913495b79c34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Przemys=C5=82aw=20Czerpak?= Date: Wed, 10 Apr 2024 15:39:15 +0200 Subject: [PATCH] 2024-04-10 15:39 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) * utils/hbmk2/hbmk2.prg ! fixed my last modification and check if HB_WITH_* contains non empty value --- ChangeLog.txt | 5 +++++ utils/hbmk2/hbmk2.prg | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index e1736f5706..a149e5544b 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -7,6 +7,11 @@ Entries may not always be in chronological/commit order. See license at the end of file. */ +2024-04-10 15:39 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) + * utils/hbmk2/hbmk2.prg + ! fixed my last modification and check if HB_WITH_* contains + non empty value + 2024-03-07 13:41 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) * contrib/gtqtc/gtqtc.hbp ! do not detect QT5 when HB_BUILD_3RDEXT=no is set diff --git a/utils/hbmk2/hbmk2.prg b/utils/hbmk2/hbmk2.prg index 828a1ee159..dd11a6b714 100644 --- a/utils/hbmk2/hbmk2.prg +++ b/utils/hbmk2/hbmk2.prg @@ -9131,7 +9131,7 @@ STATIC PROCEDURE dep_try_detection( hbmk, dep ) IF ! dep[ _HBMKDEP_lDetected ] dep_postprocess_one( hbmk, dep ) IF dep[ _HBMKDEP_cControl ] == "local" .OR. ; - ( ! Empty( dep[ _HBMKDEP_aINCPATH ] ) .AND. dep[ _HBMKDEP_aINCPATH ][ 1 ] == dep[ _HBMKDEP_cControl ] ) .OR. ; + ( ! Empty( dep[ _HBMKDEP_aINCPATH ] ) .AND. ! Empty( dep[ _HBMKDEP_cControl ] ) .AND. dep[ _HBMKDEP_aINCPATH ][ 1 ] == dep[ _HBMKDEP_cControl ] ) .OR. ; ! dep_try_pkg_detection( hbmk, dep ) dep_try_header_detection( hbmk, dep ) ENDIF