[Cmake-commits] [cmake-commits] king committed cmDocumentVariables.cxx 1.35 1.36 cmTarget.cxx 1.256 1.257

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv1664/Source

Modified Files:
	cmDocumentVariables.cxx cmTarget.cxx 
Log Message:
ENH: Do not compute link language for LOCATION

The LOCATION property requires the full file name of a target to be
computed.  Previously we computed the linker language for a target to
look up variables such as CMAKE_SHARED_LIBRARY_SUFFIX_<LANG>.  This led
to locating all the source files immediately instead of delaying the
search to generation time.  In the future even more computation will be
needed to get the linker language, so it is better to avoid it.

The _<LANG> versions of these variables are undocumented, not set in any
platform file we provide, and do not produce hits in google.  This
change just removes the unused feature outright.


Index: cmDocumentVariables.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmDocumentVariables.cxx,v
retrieving revision 1.35
retrieving revision 1.36
diff -C 2 -d -r1.35 -r1.36
*** cmDocumentVariables.cxx	30 Jun 2009 13:05:26 -0000	1.35
--- cmDocumentVariables.cxx	8 Jul 2009 17:03:22 -0000	1.36
***************
*** 1246,1251 ****
    cm->DefineProperty("CMAKE_<LANG>_USE_RESPONSE_FILE_FOR_OBJECTS",
                       cmProperty::VARIABLE,0,0);
-   cm->DefineProperty("CMAKE_EXECUTABLE_SUFFIX_<LANG>",
-                      cmProperty::VARIABLE,0,0);
    cm->DefineProperty("CMAKE_EXE_LINK_DYNAMIC_<LANG>_FLAGS",
                       cmProperty::VARIABLE,0,0);
--- 1246,1249 ----
***************
*** 1254,1261 ****
    cm->DefineProperty("CMAKE_GENERATOR_<LANG>",
                       cmProperty::VARIABLE,0,0);
-   cm->DefineProperty("CMAKE_IMPORT_LIBRARY_PREFIX_<LANG>",
-                      cmProperty::VARIABLE,0,0);
-   cm->DefineProperty("CMAKE_IMPORT_LIBRARY_SUFFIX_<LANG>",
-                      cmProperty::VARIABLE,0,0);
    cm->DefineProperty("CMAKE_INCLUDE_FLAG_<LANG>",
                       cmProperty::VARIABLE,0,0);
--- 1252,1255 ----

Index: cmTarget.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmTarget.cxx,v
retrieving revision 1.256
retrieving revision 1.257
diff -C 2 -d -r1.256 -r1.257
*** cmTarget.cxx	8 Jul 2009 16:04:48 -0000	1.256
--- cmTarget.cxx	8 Jul 2009 17:03:22 -0000	1.257
***************
*** 2709,2727 ****
    const char* prefixVar = this->GetPrefixVariableInternal(implib);
    const char* suffixVar = this->GetSuffixVariableInternal(implib);
-   const char* ll = this->GetLinkerLanguage();
-   // first try language specific suffix
-   if(ll)
-     {
-     if(!targetSuffix && suffixVar && *suffixVar)
-       {
-       std::string langSuff = suffixVar + std::string("_") + ll;
-       targetSuffix = this->Makefile->GetDefinition(langSuff.c_str());
-       }
-     if(!targetPrefix && prefixVar && *prefixVar)
-       {
-       std::string langPrefix = prefixVar + std::string("_") + ll;
-       targetPrefix = this->Makefile->GetDefinition(langPrefix.c_str());
-       }
-     }
  
    // if there is no prefix on the target use the cmake definition
--- 2709,2712 ----