https://github.com/Kitware/CMake
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
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
Tip revision: 0c7433e874d5f28b15009dbfb1f19ecb34cd71ee authored by Roland Schulz on 13 April 2018, 00:49:05 UTC
FindOpenMP: Fix support for Intel on Windows
FindOpenMP: Fix support for Intel on Windows
Tip revision: 0c7433e
cmProcessOutput.h
/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying
file Copyright.txt or https://cmake.org/licensing for details. */
#ifndef cmProcessOutput_h
#define cmProcessOutput_h
#include "cmConfigure.h" // IWYU pragma: keep
#include <stddef.h>
#include <string>
#include <vector>
/** \class cmProcessOutput
* \brief Decode text data to internal encoding.
*
* cmProcessOutput is used to decode text output from external process
* using external encoding to our internal encoding.
*/
class cmProcessOutput
{
public:
enum Encoding
{
None,
Auto,
UTF8,
ANSI,
OEM
};
/**
* Find encoding enum value for given encoding \a name.
* \param name a encoding name.
* \return encoding enum value or Auto if \a name was not found.
*/
static Encoding FindEncoding(std::string const& name);
/// The code page that is used as internal encoding to which we will encode.
static unsigned int defaultCodepage;
/**
* A class constructor.
* \param encoding external process encoding from which we will decode.
* \param maxSize a maximal size for process output buffer. It should match
* to KWSYSPE_PIPE_BUFFER_SIZE. If text we decode is same size as \a maxSize
* then we will check for incomplete character at end of buffer and
* we will not return last incomplete character. This character will be
* returned with next DecodeText() call. To disable this behavior specify
* 0 as \a maxSize.
*/
cmProcessOutput(Encoding encoding = Auto, unsigned int maxSize = 1024);
~cmProcessOutput();
/**
* Decode \a raw string using external encoding to internal
* encoding in \a decoded.
* \a id specifies which internal buffer to use. This is important when we
* are decoding both stdout and stderr from process output and we need to
* keep incomplete characters in separate buffers for each stream.
* \return true if successfully decoded \a raw to \a decoded or false if not.
*/
bool DecodeText(std::string raw, std::string& decoded, size_t id = 0);
/**
* Decode \a data with \a length from external encoding to internal
* encoding in \a decoded.
* \param data a pointer to process output text data.
* \param length a size of data buffer.
* \param decoded a string which will contain decoded text.
* \param id an internal buffer id to use.
* \return true if successfully decoded \a data to \a decoded or false if
* not.
*/
bool DecodeText(const char* data, size_t length, std::string& decoded,
size_t id = 0);
/**
* \overload
*/
bool DecodeText(std::vector<char> raw, std::vector<char>& decoded,
size_t id = 0);
private:
#if defined(_WIN32)
unsigned int codepage;
unsigned int bufferSize;
std::vector<std::string> rawparts;
bool DoDecodeText(std::string raw, std::string& decoded, wchar_t* lastChar);
#endif
};
#endif
Computing file changes ...