From 9636423cb278ea0901082038b2febb9f0ec2b3de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 18 Dec 2019 14:27:05 +0100 Subject: [PATCH] modules: be less stupid when parsing Magnum/configure.h. --- modules/FindMagnum.cmake | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/modules/FindMagnum.cmake b/modules/FindMagnum.cmake index 87ce8da81..098bd836e 100644 --- a/modules/FindMagnum.cmake +++ b/modules/FindMagnum.cmake @@ -243,10 +243,9 @@ endif() # Read flags from configuration file(READ ${_MAGNUM_CONFIGURE_FILE} _magnumConfigure) +string(REGEX REPLACE ";" "\\\\;" _magnumConfigure "${_magnumConfigure}") +string(REGEX REPLACE "\n" ";" _magnumConfigure "${_magnumConfigure}") set(_magnumFlags - # WARNING: CAREFUL HERE, the string(FIND) succeeds even if a subset is - # found -- so e.g. looking for TARGET_GL will match TARGET_GLES2 as well. - # So far that's not a problem, but might become an issue for new flags. BUILD_DEPRECATED BUILD_STATIC TARGET_GL @@ -258,7 +257,7 @@ set(_magnumFlags TARGET_HEADLESS TARGET_VK) foreach(_magnumFlag ${_magnumFlags}) - string(FIND "${_magnumConfigure}" "#define MAGNUM_${_magnumFlag}" _magnum_${_magnumFlag}) + list(FIND _magnumConfigure "#define CORRADE_${_magnumFlag}" _magnum_${_magnumFlag}) if(NOT _magnum_${_magnumFlag} EQUAL -1) set(MAGNUM_${_magnumFlag} 1) endif()