From a1bb7e90ef878c41f9725f0f7000b027f8dcd14a Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 14 May 2008 11:54:52 -0400 Subject: ENH: Allow users to specify macro-like #include line transforms for dependency scanning. - Define IMPLICIT_DEPENDS_INCLUDE_TRANSFORM property on targets and directories. - Make the directory version inherited. - See issue #6648. --- Source/cmLocalUnixMakefileGenerator3.cxx | 26 ++++++++++++++++++++++++++ Source/cmMakefile.cxx | 26 ++++++++++++++++++++++++++ Source/cmTarget.cxx | 18 ++++++++++++++++++ 3 files changed, 70 insertions(+) diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx index 50921be..38ceba6 100644 --- a/Source/cmLocalUnixMakefileGenerator3.cxx +++ b/Source/cmLocalUnixMakefileGenerator3.cxx @@ -1875,6 +1875,32 @@ void cmLocalUnixMakefileGenerator3 cmakefileStream << " )\n"; } + + // Store include transform rule properties. Write the directory + // rules first because they may be overridden by later target rules. + std::vector transformRules; + if(const char* xform = + this->Makefile->GetProperty("IMPLICIT_DEPENDS_INCLUDE_TRANSFORM")) + { + cmSystemTools::ExpandListArgument(xform, transformRules); + } + if(const char* xform = + target.GetProperty("IMPLICIT_DEPENDS_INCLUDE_TRANSFORM")) + { + cmSystemTools::ExpandListArgument(xform, transformRules); + } + if(!transformRules.empty()) + { + cmakefileStream + << "SET(CMAKE_INCLUDE_TRANSFORMS\n"; + for(std::vector::const_iterator tri = transformRules.begin(); + tri != transformRules.end(); ++tri) + { + cmakefileStream << " " << this->EscapeForCMake(tri->c_str()) << "\n"; + } + cmakefileStream + << " )\n"; + } } //---------------------------------------------------------------------------- diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index bc60955..4c871ef 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -1294,6 +1294,12 @@ void cmMakefile::InitializeFromParent() // define flags this->DefineFlags = parent->DefineFlags; + // Include transform property. There is no per-config version. + { + const char* prop = "IMPLICIT_DEPENDS_INCLUDE_TRANSFORM"; + this->SetProperty(prop, parent->GetProperty(prop)); + } + // compile definitions property and per-config versions { this->SetProperty("COMPILE_DEFINITIONS", @@ -3209,6 +3215,26 @@ void cmMakefile::DefineProperties(cmake *cm) "in the directory's parent.\n"); cm->DefineProperty + ("IMPLICIT_DEPENDS_INCLUDE_TRANSFORM", cmProperty::DIRECTORY, + "Specify #include line transforms for dependencies in a directory.", + "This property specifies rules to transform macro-like #include lines " + "during implicit dependency scanning of C and C++ source files. " + "The list of rules must be semicolon-separated with each entry of " + "the form \"A_MACRO(%)=value-with-%\" (the % must be literal). " + "During dependency scanning occurrences of A_MACRO(...) on #include " + "lines will be replaced by the value given with the macro argument " + "substituted for '%'. For example, the entry\n" + " MYDIR(%)=\n" + "will convert lines of the form\n" + " #include MYDIR(myheader.h)\n" + "to\n" + " #include \n" + "allowing the dependency to be followed.\n" + "This property applies to sources in all targets within a directory. " + "The property value is initialized in each directory by its value " + "in the directory's parent."); + + cm->DefineProperty ("EXCLUDE_FROM_ALL", cmProperty::DIRECTORY, "Exclude the directory from the all target of its parent.", "A property on a directory that indicates if its targets are excluded " diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index 70ba7ea..f9c9426 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -159,6 +159,24 @@ void cmTarget::DefineProperties(cmake *cm) "target has no C++ code in it."); cm->DefineProperty + ("IMPLICIT_DEPENDS_INCLUDE_TRANSFORM", cmProperty::TARGET, + "Specify #include line transforms for dependencies in a target.", + "This property specifies rules to transform macro-like #include lines " + "during implicit dependency scanning of C and C++ source files. " + "The list of rules must be semicolon-separated with each entry of " + "the form \"A_MACRO(%)=value-with-%\" (the % must be literal). " + "During dependency scanning occurrences of A_MACRO(...) on #include " + "lines will be replaced by the value given with the macro argument " + "substituted for '%'. For example, the entry\n" + " MYDIR(%)=\n" + "will convert lines of the form\n" + " #include MYDIR(myheader.h)\n" + "to\n" + " #include \n" + "allowing the dependency to be followed.\n" + "This property applies to sources in the target on which it is set."); + + cm->DefineProperty ("IMPORT_PREFIX", cmProperty::TARGET, "What comes before the import library name.", "Similar to the target property PREFIX, but used for import libraries " -- cgit v0.12