Martin Kroeker
GitHub
6 years ago
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Unified View
Diff Options
-
+3 -2cmake/utils.cmake
+ 3
- 2
cmake/utils.cmake
View File
| @@ -43,7 +43,8 @@ macro(ParseMakefileVars MAKEFILE_IN) | |||||
| if (NOT "${line_match}" STREQUAL "") | if (NOT "${line_match}" STREQUAL "") | ||||
| #message(STATUS "match on ${line_match}") | #message(STATUS "match on ${line_match}") | ||||
| set(var_name ${CMAKE_MATCH_1}) | set(var_name ${CMAKE_MATCH_1}) | ||||
| set(var_value ${CMAKE_MATCH_2}) | |||||
| # set(var_value ${CMAKE_MATCH_2}) | |||||
| string(STRIP ${CMAKE_MATCH_2} var_value) | |||||
| # check for Makefile variables in the string, e.g. $(TSUFFIX) | # check for Makefile variables in the string, e.g. $(TSUFFIX) | ||||
| string(REGEX MATCHALL "\\$\\(([0-9_a-zA-Z]+)\\)" make_var_matches ${var_value}) | string(REGEX MATCHALL "\\$\\(([0-9_a-zA-Z]+)\\)" make_var_matches ${var_value}) | ||||
| foreach (make_var ${make_var_matches}) | foreach (make_var ${make_var_matches}) | ||||
| @@ -63,7 +64,7 @@ macro(ParseMakefileVars MAKEFILE_IN) | |||||
| string(REGEX MATCH "ifeq \\(\\$\\(([_A-Z]+)\\),[ \t]*([0-9_A-Z]+)\\)" line_match "${makefile_line}") | string(REGEX MATCH "ifeq \\(\\$\\(([_A-Z]+)\\),[ \t]*([0-9_A-Z]+)\\)" line_match "${makefile_line}") | ||||
| if (NOT "${line_match}" STREQUAL "") | if (NOT "${line_match}" STREQUAL "") | ||||
| # message(STATUS "IFEQ: ${line_match} first: ${CMAKE_MATCH_1} second: ${CMAKE_MATCH_2}") | # message(STATUS "IFEQ: ${line_match} first: ${CMAKE_MATCH_1} second: ${CMAKE_MATCH_2}") | ||||
| if (${${CMAKE_MATCH_1}} STREQUAL ${CMAKE_MATCH_2}) | |||||
| if (DEFINED ${${CMAKE_MATCH_1}} AND ${${CMAKE_MATCH_1}} STREQUAL ${CMAKE_MATCH_2}) | |||||
| # message (STATUS "condition is true") | # message (STATUS "condition is true") | ||||
| set (IfElse 1) | set (IfElse 1) | ||||
| else () | else () | ||||