From 3c826c592260fb0a7a83ca727881018dcffb3576 Mon Sep 17 00:00:00 2001 From: Gabriel Ferreira Date: Thu, 27 Apr 2023 14:23:45 -0300 Subject: [PATCH] build: do not add a prefix when parent directories contain "scratch" --- build-support/macros-and-definitions.cmake | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/build-support/macros-and-definitions.cmake b/build-support/macros-and-definitions.cmake index 500f54d0e..b826e64a8 100644 --- a/build-support/macros-and-definitions.cmake +++ b/build-support/macros-and-definitions.cmake @@ -1590,8 +1590,11 @@ function(build_exec) ) # Resolve nested scratch prefixes without user intervention - if("${CMAKE_CURRENT_SOURCE_DIR}" MATCHES "scratch" - AND "${BEXEC_EXECNAME_PREFIX}" STREQUAL "" + string(REPLACE "${PROJECT_SOURCE_DIR}" "" relative_path + "${CMAKE_CURRENT_SOURCE_DIR}" + ) + if("${relative_path}" MATCHES "scratch" AND "${BEXEC_EXECNAME_PREFIX}" + STREQUAL "" ) get_scratch_prefix(BEXEC_EXECNAME_PREFIX) endif()