From f8fec93f0e99645b09c1d85dcdff47f2df1f0f68 Mon Sep 17 00:00:00 2001 From: peri4 Date: Sat, 19 Oct 2024 17:10:47 +0300 Subject: [PATCH] fix qad_wrap() - support for complex extensions (e.g. "file.1.cpp") --- cmake/QtWraps.cmake | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cmake/QtWraps.cmake b/cmake/QtWraps.cmake index 9ecc10d..6d661fe 100644 --- a/cmake/QtWraps.cmake +++ b/cmake/QtWraps.cmake @@ -503,24 +503,24 @@ macro(qad_wrap) get_filename_component(_EXT "${_i}" EXT) #message("${_EXT}") if (NOT ("x${_EXT}" STREQUAL "x")) - if (("x${_EXT}" STREQUAL "x.h") OR ("x${_EXT}" STREQUAL "x.hpp")) + if ("${_EXT}" MATCHES ".*\\.h(pp)?$") list(APPEND H_LIST "${_i}") #message("header") endif() - if (("x${_EXT}" STREQUAL "x.c") OR ("x${_EXT}" STREQUAL "x.cpp") OR ("x${_EXT}" STREQUAL "x.cxx")) + if ("${_EXT}" MATCHES ".*\\.c((pp)|(xx))?$") list(APPEND CPP_LIST "${_i}") #message("source") endif() - if ("x${_EXT}" STREQUAL "x.ui") + if ("${_EXT}" MATCHES ".*\\.ui$") list(APPEND UI_LIST "${_i}") endif() - if ("x${_EXT}" STREQUAL "x.qrc") + if ("${_EXT}" MATCHES ".*\\.qrc$") list(APPEND RES_LIST "${_i}") endif() - if ("x${_EXT}" STREQUAL "x.rc") + if ("${_EXT}" MATCHES ".*\\.rc$") list(APPEND RC_LIST "${_i}") endif() - if ("x${_EXT}" STREQUAL "x.ts") + if ("${_EXT}" MATCHES ".*\\.ts$") list(APPEND TS_LIST "${_i}") endif() endif()