https://github.com/Kitware/CMake
Revision cfa3a2342f01ada6278bccf4c151b0e1e88798c4 authored by Brad King on 30 March 2020, 17:26:20 UTC, committed by Kitware Robot on 30 March 2020, 17:26:49 UTC
3b4838b57f GoogleTest: Add tests for MultiConfig discovery in PRE_TEST mode
1ba4cb565e GoogleTest: Parameterize tests to check PRE_TEST/POST_BUILD discovery mode
75e82a13db GoogleTest: Add new DISCOVERY_MODE option to gtest_discover_tests
889a7146ff GoogleTestAddTests: Refactor into callable method

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4078
2 parent s e20146b + 3b4838b
Raw File
Tip revision: cfa3a2342f01ada6278bccf4c151b0e1e88798c4 authored by Brad King on 30 March 2020, 17:26:20 UTC
Merge topic 'gtest_discover_tests_cross_compile_support'
Tip revision: cfa3a23
cmMSVC60LinkLineComputer.cxx
/* Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
   file Copyright.txt or https://cmake.org/licensing for details.  */

#include "cmMSVC60LinkLineComputer.h"

#if defined(_WIN32) && !defined(__CYGWIN__)
#  include "cmSystemTools.h"
#endif

class cmOutputConverter;

cmMSVC60LinkLineComputer::cmMSVC60LinkLineComputer(
  cmOutputConverter* outputConverter, cmStateDirectory const& stateDir)
  : cmLinkLineComputer(outputConverter, stateDir)
{
}

std::string cmMSVC60LinkLineComputer::ConvertToLinkReference(
  std::string const& lib) const
{
#if defined(_WIN32) && !defined(__CYGWIN__)
  // Work-ardound command line parsing limitations in MSVC 6.0
  // Search for the last space.
  std::string::size_type pos = lib.rfind(' ');
  if (pos != std::string::npos) {
    // Find the slash after the last space, if any.
    pos = lib.find('/', pos);

    // Convert the portion of the path with a space to a short path.
    std::string sp;
    if (cmSystemTools::GetShortPath(lib.substr(0, pos).c_str(), sp)) {
      // Append the rest of the path with no space.
      sp += lib.substr(pos);
      return sp;
    }
  }
#endif

  return cmLinkLineComputer::ConvertToLinkReference(lib);
}
back to top