AnotherFoxGuy/autocmake
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix rewrite of options wrappers

Browse Source
This commit is contained in:
Roberto Di Remigio 2018-03-12 21:11:27 +01:00
parent e9eba12bdd
commit 1cd15647dd
No known key found for this signature in database
GPG Key ID: E4FADFE6DFB29C6E
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
autocmake/generate.py
View File

@ -62,8 +62,8 @@ macro(print_option)
"${multiValueArgs}" "${multiValueArgs}"
${ARGN} ${ARGN}
) )
if(NOT DEFINED ${print_option_NAME} OR "${${print_option_VARIABLE}}" STREQUAL "") if(NOT DEFINED ${print_option_NAME} OR "${${print_option_NAME}}" STREQUAL "")
message(STATUS "Setting (unspecified) option ${print_option_VARIABLE}: ${print_option_DEFAULT}") message(STATUS "Setting (unspecified) option ${print_option_NAME}: ${print_option_DEFAULT}")
else() else()
message(STATUS "Setting option ${print_option_NAME}: ${print_option_DEFAULT}") message(STATUS "Setting option ${print_option_NAME}: ${print_option_DEFAULT}")
endif() endif()
@ -82,7 +82,10 @@ macro(option_with_print)
"${multiValueArgs}" "${multiValueArgs}"
${ARGN} ${ARGN}
) )
print_option(${option_with_print_NAME} ${option_with_print_DEFAULT}) print_option(
NAME ${option_with_print_NAME}
DEFAULT ${option_with_print_DEFAULT}
)
option(${option_with_print_NAME} ${option_with_print_MESSAGE} ${option_with_print_DEFAULT}) option(${option_with_print_NAME} ${option_with_print_MESSAGE} ${option_with_print_DEFAULT})
endmacro() endmacro()
@ -102,7 +105,10 @@ macro(option_with_default)
"${multiValueArgs}" "${multiValueArgs}"
${ARGN} ${ARGN}
) )
print_option(${option_with_default_NAME} "${option_with_default_DEFAULT}") print_option(
NAME ${option_with_default_NAME}
DEFAULT "${option_with_default_DEFAULT}"
)
if(NOT DEFINED ${option_with_default_NAME} OR "${${option_with_default_NAME}}" STREQUAL "") if(NOT DEFINED ${option_with_default_NAME} OR "${${option_with_default_NAME}}" STREQUAL "")
set(${option_with_default_NAME} "${option_with_default_DEFAULT}" CACHE STRING ${option_with_default_MESSAGE} FORCE) set(${option_with_default_NAME} "${option_with_default_DEFAULT}" CACHE STRING ${option_with_default_MESSAGE} FORCE)
endif() endif()