diff options
| author | Brad King <brad.king@kitware.com> | 2018-05-21 15:03:45 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-05-21 11:04:04 -0400 |
| commit | 64ec064212d27c91bb88967f9c242f131f2663e7 (patch) | |
| tree | 82ddb17bec5ba695206df0a2a2be80f92d8d4b5c | |
| parent | 7b42ffce09b589b8a7b1af348920e9c4808bd69f (diff) | |
| parent | fd0da95f6333b7a12f4f9b22e60adb429430d283 (diff) | |
| download | cmake-64ec064212d27c91bb88967f9c242f131f2663e7.tar.gz | |
Merge topic 'eclipse-custom-content'
fd0da95f63 Eclipse: Add property to include additional contents in .cproject file
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2088
| -rw-r--r-- | Help/manual/cmake-properties.7.rst | 1 | ||||
| -rw-r--r-- | Help/prop_gbl/ECLIPSE_EXTRA_CPROJECT_CONTENTS.rst | 12 | ||||
| -rw-r--r-- | Help/prop_gbl/ECLIPSE_EXTRA_NATURES.rst | 2 | ||||
| -rw-r--r-- | Source/cmExtraEclipseCDT4Generator.cxx | 7 |
4 files changed, 22 insertions, 0 deletions
diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst index b313f38416..9f9c53f086 100644 --- a/Help/manual/cmake-properties.7.rst +++ b/Help/manual/cmake-properties.7.rst @@ -40,6 +40,7 @@ Properties of Global Scope /prop_gbl/JOB_POOLS /prop_gbl/PREDEFINED_TARGETS_FOLDER /prop_gbl/ECLIPSE_EXTRA_NATURES + /prop_gbl/ECLIPSE_EXTRA_CPROJECT_CONTENTS /prop_gbl/REPORT_UNDEFINED_PROPERTIES /prop_gbl/RULE_LAUNCH_COMPILE /prop_gbl/RULE_LAUNCH_CUSTOM diff --git a/Help/prop_gbl/ECLIPSE_EXTRA_CPROJECT_CONTENTS.rst b/Help/prop_gbl/ECLIPSE_EXTRA_CPROJECT_CONTENTS.rst new file mode 100644 index 0000000000..50c41a9239 --- /dev/null +++ b/Help/prop_gbl/ECLIPSE_EXTRA_CPROJECT_CONTENTS.rst @@ -0,0 +1,12 @@ +ECLIPSE_EXTRA_CPROJECT_CONTENTS +------------------------------- + +Additional contents to be inserted into the generated Eclipse cproject file. + +The cproject file defines the CDT specific information. Some third party IDE's +are based on Eclipse with the addition of other information specific to that IDE. +Through this property, it is possible to add this additional contents to +the generated project. +It is expected to contain valid XML. + +Also see the :prop_gbl:`ECLIPSE_EXTRA_NATURES` property. diff --git a/Help/prop_gbl/ECLIPSE_EXTRA_NATURES.rst b/Help/prop_gbl/ECLIPSE_EXTRA_NATURES.rst index 6d1529d3aa..a46575ffaa 100644 --- a/Help/prop_gbl/ECLIPSE_EXTRA_NATURES.rst +++ b/Help/prop_gbl/ECLIPSE_EXTRA_NATURES.rst @@ -6,3 +6,5 @@ List of natures to add to the generated Eclipse project file. Eclipse projects specify language plugins by using natures. This property should be set to the unique identifier for a nature (which looks like a Java package name). + +Also see the :prop_gbl:`ECLIPSE_EXTRA_CPROJECT_CONTENTS` property. diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx index 258c9ca26b..e7279d9184 100644 --- a/Source/cmExtraEclipseCDT4Generator.cxx +++ b/Source/cmExtraEclipseCDT4Generator.cxx @@ -1001,6 +1001,13 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const xml.EndElement(); // project xml.EndElement(); // storageModule + + // Append additional cproject contents without applying any XML formatting + if (const char* extraCProjectContents = + mf->GetState()->GetGlobalProperty("ECLIPSE_EXTRA_CPROJECT_CONTENTS")) { + fout << extraCProjectContents; + } + xml.EndElement(); // cproject } |