diff options
| -rw-r--r-- | cmake/module/feature.cmake | 2 | ||||
| -rw-r--r-- | cmake/module/runfile.cmake | 28 |
2 files changed, 22 insertions, 8 deletions
diff --git a/cmake/module/feature.cmake b/cmake/module/feature.cmake index 380a88d..d97761b 100644 --- a/cmake/module/feature.cmake +++ b/cmake/module/feature.cmake @@ -240,7 +240,7 @@ createFeatureModuleFunction("outFeaturesToFile" "" endforeach() # Check if feature is enable, and push them to file - if("FEATURE_\${feature}" IN_LIST cacheVars AND NOT "\${FEATURE_\${feature}}" STREQUAL "") + if("FEATURE_\${feature}" IN_LIST cacheVars AND DEFINED "\${FEATURE_\${feature}}") file(APPEND "\${OUT_FILE}" "FEATURE_\${feature}_IS_ENABLING = " "\\"TRUE\\"\n") endif() diff --git a/cmake/module/runfile.cmake b/cmake/module/runfile.cmake index a861b9a..86c7493 100644 --- a/cmake/module/runfile.cmake +++ b/cmake/module/runfile.cmake @@ -1,13 +1,27 @@ -get_property(IS_INITIALIZED GLOBAL PROPERTY CONFFILE_MODULE SET) +#[[ + # Copyright (c) 2026 Alexey Gavrilov <alexey.gavrilov@mail.com> + # + # This file is part of ObjectiveOS. + # + # ObjectiveOS is free software: you can redistribute it and/or modify it under + # the terms of the GNU General Public License as published by the Free Software + # Foundation, either version 3 of the License, or (at your option) any later + # version. + # + # ObjectiveOS is distributed in the hope that it will be useful, but WITHOUT ANY + # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + # + # You should have received a copy of the GNU General Public License along with + # ObjectiveOS. If not, see <https://www.gnu.org/licenses/>. + ]] -if(NOT IS_INITIALIZED) - set_property(GLOBAL PROPERTY CONFFILE_MODULE TRUE) - set(CONFFILE_NAME "CMakeFeaturesDefineEnum.txt" CACHE STRING "Build configuration - file contains cmake run command to reproduce last run") -endif() +include_guard(GLOBAL) + +set(CONFFILE_NAME "CMakeFeaturesDefineEnum.txt" CACHE STRING "Build configuration +file contains cmake run command to reproduce last run") macro(convertCacheVarIntoArg var cachelist outfile) - if("${var}" IN_LIST ${cachelist} AND NOT "${${var}}" STREQUAL "") + if("${var}" IN_LIST ${cachelist} AND DEFINED "${${var}}") file(APPEND ${${outfile}} " -D${var}=${${var}}") endif() endmacro() |