diff options
| author | Brad King <brad.king@kitware.com> | 2014-01-06 15:35:59 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-01-06 15:35:59 (GMT) |
| commit | 185c95ce9e7cb447f4037d45823c953a964a1859 (patch) | |
| tree | 0228e1439be190f88abf77d89b9c3a858a867c23 | |
| parent | ff6f80baaa90b79eeeb6704b225ac57cd3a4b14f (diff) | |
| parent | e6b0f452ee1d2cbe26f9977c94470c223c13ab05 (diff) | |
| download | CMake-185c95ce9e7cb447f4037d45823c953a964a1859.zip CMake-185c95ce9e7cb447f4037d45823c953a964a1859.tar.gz CMake-185c95ce9e7cb447f4037d45823c953a964a1859.tar.bz2 | |
Merge topic 'EclipseUse64bitMachOParser'
e6b0f45 Eclipse: use MachO64 parser starting with Helios (#14380)
| -rw-r--r-- | Source/cmExtraEclipseCDT4Generator.cxx | 6 | ||||
| -rw-r--r-- | Source/cmExtraEclipseCDT4Generator.h | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx index 755b445..c93187e 100644 --- a/Source/cmExtraEclipseCDT4Generator.cxx +++ b/Source/cmExtraEclipseCDT4Generator.cxx @@ -40,6 +40,7 @@ cmExtraEclipseCDT4Generator this->SupportsVirtualFolders = true; this->GenerateLinkedResources = true; this->SupportsGmakeErrorParser = true; + this->SupportsMachO64Parser = true; } //---------------------------------------------------------------------------- @@ -93,6 +94,7 @@ void cmExtraEclipseCDT4Generator::Generate() if (version < 3006) // 3.6 is Helios { this->SupportsVirtualFolders = false; + this->SupportsMachO64Parser = false; } if (version < 3007) // 3.7 is Indigo { @@ -754,7 +756,9 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const } else if (systemName == "Darwin") { - fout << "<extension id=\"org.eclipse.cdt.core.MachO\"" + fout << "<extension id=\"" << + (this->SupportsMachO64Parser ? "org.eclipse.cdt.core.MachO64" + : "org.eclipse.cdt.core.MachO") << "\"" " point=\"org.eclipse.cdt.core.BinaryParser\">\n" "<attribute key=\"c++filt\" value=\"c++filt\"/>\n" "</extension>\n" diff --git a/Source/cmExtraEclipseCDT4Generator.h b/Source/cmExtraEclipseCDT4Generator.h index 9c89f85..d88b247 100644 --- a/Source/cmExtraEclipseCDT4Generator.h +++ b/Source/cmExtraEclipseCDT4Generator.h @@ -115,6 +115,7 @@ private: bool GenerateLinkedResources; bool SupportsVirtualFolders; bool SupportsGmakeErrorParser; + bool SupportsMachO64Parser; }; |