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
cmWriteFileCommand.cxx
/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmWriteFileCommand.h"
#include "cmsys/FStream.hxx"
#include "cmMakefile.h"
#include "cmSystemTools.h"
#include "cm_sys_stat.h"
class cmExecutionStatus;
// cmLibraryCommand
bool cmWriteFileCommand::InitialPass(std::vector<std::string> const& args,
cmExecutionStatus&)
{
if (args.size() < 2) {
this->SetError("called with incorrect number of arguments");
return false;
}
std::string message;
std::vector<std::string>::const_iterator i = args.begin();
std::string const& fileName = *i;
bool overwrite = true;
i++;
for (; i != args.end(); ++i) {
if (*i == "APPEND") {
overwrite = false;
} else {
message += *i;
}
}
if (!this->Makefile->CanIWriteThisFile(fileName)) {
std::string e =
"attempted to write a file: " + fileName + " into a source directory.";
this->SetError(e);
cmSystemTools::SetFatalErrorOccured();
return false;
}
std::string dir = cmSystemTools::GetFilenamePath(fileName);
cmSystemTools::MakeDirectory(dir);
mode_t mode = 0;
// Set permissions to writable
if (cmSystemTools::GetPermissions(fileName.c_str(), mode)) {
cmSystemTools::SetPermissions(fileName.c_str(),
#if defined(_MSC_VER) || defined(__MINGW32__)
mode | S_IWRITE
#else
mode | S_IWUSR | S_IWGRP
#endif
);
}
// If GetPermissions fails, pretend like it is ok. File open will fail if
// the file is not writable
cmsys::ofstream file(fileName.c_str(),
overwrite ? std::ios::out : std::ios::app);
if (!file) {
std::string error = "Internal CMake error when trying to open file: ";
error += fileName;
error += " for writing.";
this->SetError(error);
return false;
}
file << message << std::endl;
file.close();
if (mode) {
cmSystemTools::SetPermissions(fileName.c_str(), mode);
}
return true;
}
Computing file changes ...