[PATCH] File Format is now determined within the Compiler-Specific= Modules<br>
Fri Dec 17 18:32:05 EST 2010
<br>
---<br>
=A0Source/cmSystemTools.cxx | =A0 65 --------------------------------------=
--------<br>
=A0Source/cmSystemTools.h =A0 | =A0 24 -----------------<br>
=A02 files changed, 0 insertions(+), 89 deletions(-)<br>
<br>
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx<br>
index 7bc89a4..31ceaa3 100644<br>
--- a/Source/cmSystemTools.cxx<br>
+++ b/Source/cmSystemTools.cxx<br>
@@ -1432,71 +1432,6 @@ bool cmSystemTools::SimpleGlob(const cmStdString&=
; glob,<br>
=A0 return res;<br>
=A0}<br>
<br>
-cmSystemTools::FileFormat cmSystemTools::GetFileFormat(const char* cext)<b=
r>
-{<br>
- =A0if ( ! cext || *cext =3D=3D 0 )<br>
- =A0 =A0{<br>
- =A0 =A0return cmSystemTools::NO_FILE_FORMAT;<br>
- =A0 =A0}<br>
- =A0//std::string ext =3D cmSystemTools::LowerCase(cext);<br>
- =A0std::string ext =3D cext;<br>
- =A0if ( ext =3D=3D "c" || ext =3D=3D ".c" ||<br>
- =A0 =A0 =A0 ext =3D=3D "m" || ext =3D=3D ".m"<br>
- =A0 =A0) { return cmSystemTools::C_FILE_FORMAT; }<br>
- =A0if (<br>
- =A0 =A0ext =3D=3D "C" || ext =3D=3D ".C" ||<br>
- =A0 =A0ext =3D=3D "M" || ext =3D=3D ".M" ||<br>
- =A0 =A0ext =3D=3D "c++" || ext =3D=3D ".c++" ||<br>
- =A0 =A0ext =3D=3D "cc" || ext =3D=3D ".cc" ||<br>
- =A0 =A0ext =3D=3D "cpp" || ext =3D=3D ".cpp" ||<br>
- =A0 =A0ext =3D=3D "cxx" || ext =3D=3D ".cxx" ||<br>
- =A0 =A0ext =3D=3D "mm" || ext =3D=3D ".mm"<br>
- =A0 =A0) { return cmSystemTools::CXX_FILE_FORMAT; }<br>
- =A0if (<br>
- =A0 =A0ext =3D=3D "f" || ext =3D=3D ".f" ||<br>
- =A0 =A0ext =3D=3D "F" || ext =3D=3D ".F" ||<br>
- =A0 =A0ext =3D=3D "f77" || ext =3D=3D ".f77" ||<br>
- =A0 =A0ext =3D=3D "f90" || ext =3D=3D ".f90" ||<br>
- =A0 =A0ext =3D=3D "for" || ext =3D=3D ".for" ||<br>
- =A0 =A0ext =3D=3D "f95" || ext =3D=3D ".f95"<br>
- =A0 =A0) { return cmSystemTools::FORTRAN_FILE_FORMAT; }<br>
- =A0if ( ext =3D=3D "java" || ext =3D=3D ".java" )<br>
- =A0 =A0{ return cmSystemTools::JAVA_FILE_FORMAT; }<br>
- =A0if (<br>
- =A0 =A0ext =3D=3D "H" || ext =3D=3D ".H" ||<br>
- =A0 =A0ext =3D=3D "h" || ext =3D=3D ".h" ||<br>
- =A0 =A0ext =3D=3D "h++" || ext =3D=3D ".h++" ||<br>
- =A0 =A0ext =3D=3D "hm" || ext =3D=3D ".hm" ||<br>
- =A0 =A0ext =3D=3D "hpp" || ext =3D=3D ".hpp" ||<br>
- =A0 =A0ext =3D=3D "hxx" || ext =3D=3D ".hxx" ||<br>
- =A0 =A0ext =3D=3D "in" || ext =3D=3D ".in" ||<br>
- =A0 =A0ext =3D=3D "txx" || ext =3D=3D ".txx"<br>
- =A0 =A0) { return cmSystemTools::HEADER_FILE_FORMAT; }<br>
- =A0if ( ext =3D=3D "rc" || ext =3D=3D ".rc" )<br>
- =A0 =A0{ return cmSystemTools::RESOURCE_FILE_FORMAT; }<br>
- =A0if ( ext =3D=3D "def" || ext =3D=3D ".def" )<br>
- =A0 =A0{ return cmSystemTools::DEFINITION_FILE_FORMAT; }<br>
- =A0if ( ext =3D=3D "lib" || ext =3D=3D ".lib" ||<br>
- =A0 =A0 =A0 ext =3D=3D "a" || ext =3D=3D ".a")<br>
- =A0 =A0{ return cmSystemTools::STATIC_LIBRARY_FILE_FORMAT; }<br>
- =A0if ( ext =3D=3D "o" || ext =3D=3D ".o" ||<br>
- =A0 =A0 =A0 ext =3D=3D "obj" || ext =3D=3D ".obj")<br=
>
- =A0 =A0{ return cmSystemTools::OBJECT_FILE_FORMAT; }<br>
-#ifdef __APPLE__<br>
- =A0if ( ext =3D=3D "dylib" || ext =3D=3D ".dylib" )<b=
r>
- =A0 =A0{ return cmSystemTools::SHARED_LIBRARY_FILE_FORMAT; }<br>
- =A0if ( ext =3D=3D "so" || ext =3D=3D ".so" ||<br>
- =A0 =A0 =A0 ext =3D=3D "bundle" || ext =3D=3D ".bundle&quo=
t; )<br>
- =A0 =A0{ return cmSystemTools::MODULE_FILE_FORMAT; }<br>
-#else // __APPLE__<br>
- =A0if ( ext =3D=3D "so" || ext =3D=3D ".so" ||<br>
- =A0 =A0 =A0 ext =3D=3D "sl" || ext =3D=3D ".sl" ||<br=
>
- =A0 =A0 =A0 ext =3D=3D "dll" || ext =3D=3D ".dll" )<b=
r>
- =A0 =A0{ return cmSystemTools::SHARED_LIBRARY_FILE_FORMAT; }<br>
-#endif // __APPLE__<br>
- =A0return cmSystemTools::UNKNOWN_FILE_FORMAT;<br>
-}<br>
-<br>
=A0bool cmSystemTools::Split(const char* s, std::vector<cmStdString>&=
amp; l)<br>
=A0{<br>
=A0 std::vector<std::string> temp;<br>
diff --git a/Source/cmSystemTools.h b/Source/cmSystemTools.h<br>
index 6f9147c..ad7ddc3 100644<br>
--- a/Source/cmSystemTools.h<br>
+++ b/Source/cmSystemTools.h<br>
@@ -249,25 +249,6 @@ public:<br>
=A0 static void EnableRunCommandOutput() {s_DisableRunCommandOutput =3D fa=
lse; }<br>
=A0 static bool GetRunCommandOutput() { return s_DisableRunCommandOutput; =
}<br>
<br>
- =A0/**<br>
- =A0 * Come constants for different file formats.<br>
- =A0 */<br>
- =A0enum FileFormat {<br>
- =A0 =A0NO_FILE_FORMAT =3D 0,<br>
- =A0 =A0C_FILE_FORMAT,<br>
- =A0 =A0CXX_FILE_FORMAT,<br>
- =A0 =A0FORTRAN_FILE_FORMAT,<br>
- =A0 =A0JAVA_FILE_FORMAT,<br>
- =A0 =A0HEADER_FILE_FORMAT,<br>
- =A0 =A0RESOURCE_FILE_FORMAT,<br>
- =A0 =A0DEFINITION_FILE_FORMAT,<br>
- =A0 =A0STATIC_LIBRARY_FILE_FORMAT,<br>
- =A0 =A0SHARED_LIBRARY_FILE_FORMAT,<br>
- =A0 =A0MODULE_FILE_FORMAT,<br>
- =A0 =A0OBJECT_FILE_FORMAT,<br>
- =A0 =A0UNKNOWN_FILE_FORMAT<br>
- =A0};<br>
-<br>
=A0 enum CompareOp {<br>
=A0 =A0 OP_LESS,<br>
=A0 =A0 OP_GREATER,<br>
@@ -280,11 +261,6 @@ public:<br>
=A0 static bool VersionCompare(CompareOp op, const char* lhs, const char* =
rhs);<br>
<br>
=A0 /**<br>
- =A0 * Determine the file type based on the extension<br>
- =A0 */<br>
- =A0static FileFormat GetFileFormat(const char* ext);<br>
-<br>
- =A0/**<br>
=A0 =A0* On Windows 9x we need a comspec (<a href=3D"http://command.com" t=
arget=3D"_blank">command.com</a>) substitute to run<br>
=A0 =A0* programs correctly. This string has to be constant available<br>
=A0 =A0* through the running of program. This method does not create a cop=
y.<br>
<font color=3D"#888888">--<br>
1.7.1+GitX<br>
</font><div><div></div><div>_______________________________________________=
<br>
Powered by <a href=3D"http://www.kitware.com" target=3D"_blank">www.kitware=
.com</a><br>
<br>
Visit other Kitware open-source projects at <a href=3D"http://www.kitware.c=
om/opensource/opensource.html" target=3D"_blank">http://www.kitware.com/ope=
nsource/opensource.html</a><br>
<br>
Please keep messages on-topic and check the CMake FAQ at: <a href=3D"http:/=
/www.cmake.org/Wiki/CMake_FAQ" target=3D"_blank">http://www.cmake.org/Wiki/=
CMake_FAQ</a><br>
<br>
Follow this link to subscribe/unsubscribe:<br>
<a href=3D"http://www.cmake.org/mailman/listinfo/cmake" target=3D"_blank">h=
ttp://www.cmake.org/mailman/listinfo/cmake</a><br>
</div></div></blockquote></div><br></div>
</div></div></blockquote></div><br></div>
--0016e65095e6e3f768049807b1ce--
More information about the CMake
mailing list