diff options
| author | Vitaly Stakhovsky <vvs31415@gitlab.org> | 2020-07-14 01:00:00 (GMT) |
|---|---|---|
| committer | Vitaly Stakhovsky <vvs31415@gitlab.org> | 2020-07-14 12:22:24 (GMT) |
| commit | 715691124240b696c8be1d7cd6ce6dbb09381c67 (patch) | |
| tree | 85829a543a5d041e7329ae2e447b3d261ea640b8 /Source/cmExtraCodeBlocksGenerator.cxx | |
| parent | 2da778664d3e99ada4e67a5a1b9d377f92a9f75f (diff) | |
| download | CMake-715691124240b696c8be1d7cd6ce6dbb09381c67.zip CMake-715691124240b696c8be1d7cd6ce6dbb09381c67.tar.gz CMake-715691124240b696c8be1d7cd6ce6dbb09381c67.tar.bz2 | |
cmIsOn: add overload accepting const std::string*
Diffstat (limited to 'Source/cmExtraCodeBlocksGenerator.cxx')
| -rw-r--r-- | Source/cmExtraCodeBlocksGenerator.cxx | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx index 652c041..be22ad4 100644 --- a/Source/cmExtraCodeBlocksGenerator.cxx +++ b/Source/cmExtraCodeBlocksGenerator.cxx @@ -236,9 +236,8 @@ void cmExtraCodeBlocksGenerator::CreateNewProjectFile( // // Also we can disable external (outside the project) files by setting ON // CMAKE_CODEBLOCKS_EXCLUDE_EXTERNAL_FILES variable. - const bool excludeExternal = - cmIsOn(it.second[0]->GetMakefile()->GetSafeDefinition( - "CMAKE_CODEBLOCKS_EXCLUDE_EXTERNAL_FILES")); + const bool excludeExternal = it.second[0]->GetMakefile()->IsOn( + "CMAKE_CODEBLOCKS_EXCLUDE_EXTERNAL_FILES"); if (!splitted.empty() && (!excludeExternal || (relative.find("..") == std::string::npos)) && relative.find("CMakeFiles") == std::string::npos) { @@ -380,9 +379,8 @@ void cmExtraCodeBlocksGenerator::CreateNewProjectFile( cmSystemTools::RelativePath(lg->GetSourceDirectory(), fullPath); // Do not add this file if it has ".." in relative path and // if CMAKE_CODEBLOCKS_EXCLUDE_EXTERNAL_FILES variable is on. - const bool excludeExternal = - cmIsOn(lg->GetMakefile()->GetSafeDefinition( - "CMAKE_CODEBLOCKS_EXCLUDE_EXTERNAL_FILES")); + const bool excludeExternal = lg->GetMakefile()->IsOn( + "CMAKE_CODEBLOCKS_EXCLUDE_EXTERNAL_FILES"); if (excludeExternal && (relative.find("..") != std::string::npos)) { continue; |