Skip to main content

Browse the archive

https://github.com/Kitware/CMake
25 August 2022, 21:50:52 UTC
Revision 0c7433e874d5f28b15009dbfb1f19ecb34cd71ee authored by Roland Schulz on 13 April 2018, 00:49:05 UTC, committed by Brad King on 16 April 2018, 18:11:12 UTC 
FindOpenMP: Fix support for Intel on Windows
 
The change in commit v3.11.0-rc1~334^2 (FindOpenMP: Use NO_DEFAULT_PATH
where appropriate, 2017-11-15) broke partial support for Intel on Windows.
Since `OpenMP_${LANG}_IMPLICIT_LINK_DIRS` is empty for this compiler
the `find_library` call without `NO_DEFAULT_PATH` worked accidentally
in environments with the needed libraries in the search path already.

Fix support for Intel on Windows by simply removing our explicit search
for the `libiomp5md` library.  In cases that it is needed, the compiler
already inserts metadata in `.obj` files to tell the MSVC linker to use
the library.

Suggested-by: Christian Pfeiffer <cpfeiffer@live.de>
Fixes: #17910
1 parent 61fd4c7
Raw File
Tip revision: 0c7433e874d5f28b15009dbfb1f19ecb34cd71ee authored by Roland Schulz on 13 April 2018, 00:49:05 UTC
FindOpenMP: Fix support for Intel on Windows
Tip revision: 0c7433e
cmGhsMultiGpj.cxx 
/* Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
   file Copyright.txt or https://cmake.org/licensing for details.  */
#include "cmGhsMultiGpj.h"

#include "cmGeneratedFileStream.h"

void GhsMultiGpj::WriteGpjTag(Types const gpjType,
                              cmGeneratedFileStream* const filestream)
{
  char const* tag;
  switch (gpjType) {
    case INTERGRITY_APPLICATION:
      tag = "INTEGRITY Application";
      break;
    case LIBRARY:
      tag = "Library";
      break;
    case PROJECT:
      tag = "Project";
      break;
    case PROGRAM:
      tag = "Program";
      break;
    case REFERENCE:
      tag = "Reference";
      break;
    case SUBPROJECT:
      tag = "Subproject";
      break;
    default:
      tag = "";
  }
  *filestream << "[" << tag << "]" << std::endl;
}
back to top