Skip to content

Commit 02829f7

Browse files
committed
Merge pull request opencv#9186 from alalek:cmake_fix_dump_duplication
2 parents 7733654 + a44c0fd commit 02829f7

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

cmake/OpenCVUtils.cmake

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,22 @@ include(CMakeParseArguments)
22

33
# Debugging function
44
function(ocv_cmake_dump_vars)
5-
set(VARS "")
6-
get_cmake_property(_variableNames VARIABLES)
5+
get_cmake_property(__variableNames VARIABLES)
76
cmake_parse_arguments(DUMP "" "TOFILE" "" ${ARGN})
87
set(regex "${DUMP_UNPARSED_ARGUMENTS}")
98
string(TOLOWER "${regex}" regex_lower)
10-
foreach(_variableName ${_variableNames})
11-
string(TOLOWER "${_variableName}" _variableName_lower)
12-
if(_variableName MATCHES "${regex}" OR _variableName_lower MATCHES "${regex_lower}")
13-
set(VARS "${VARS}${_variableName}=${${_variableName}}\n")
9+
set(__VARS "")
10+
foreach(__variableName ${__variableNames})
11+
string(TOLOWER "${__variableName}" __variableName_lower)
12+
if((__variableName MATCHES "${regex}" OR __variableName_lower MATCHES "${regex_lower}")
13+
AND NOT __variableName_lower MATCHES "^__")
14+
set(__VARS "${__VARS}${__variableName}=${${__variableName}}\n")
1415
endif()
1516
endforeach()
1617
if(DUMP_TOFILE)
17-
file(WRITE ${CMAKE_BINARY_DIR}/${DUMP_TOFILE} "${VARS}")
18+
file(WRITE ${CMAKE_BINARY_DIR}/${DUMP_TOFILE} "${__VARS}")
1819
else()
19-
message(AUTHOR_WARNING "${VARS}")
20+
message(AUTHOR_WARNING "${__VARS}")
2021
endif()
2122
endfunction()
2223

0 commit comments

Comments
 (0)