diff options
Diffstat (limited to 'Source/cmake.cxx')
| -rw-r--r-- | Source/cmake.cxx | 42 |
1 files changed, 24 insertions, 18 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx index f30d4d3..1d8a847 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -23,14 +23,11 @@ #include <cmext/algorithm> #include <cmext/string_view> -#if !defined(CMAKE_BOOTSTRAP) && !defined(_WIN32) -# include <unistd.h> -#endif - #include "cmsys/FStream.hxx" #include "cmsys/Glob.hxx" #include "cmsys/RegularExpression.hxx" +#include "cm_fileno.hxx" #include "cm_sys_stat.h" #include "cmBuildOptions.h" @@ -40,7 +37,11 @@ #include "cmCommands.h" #ifdef CMake_ENABLE_DEBUGGER # include "cmDebuggerAdapter.h" -# include "cmDebuggerPipeConnection.h" +# ifdef _WIN32 +# include "cmDebuggerWindowsPipeConnection.h" +# else //!_WIN32 +# include "cmDebuggerPosixPipeConnection.h" +# endif //_WIN32 #endif #include "cmDocumentation.h" #include "cmDocumentationEntry.h" @@ -94,7 +95,6 @@ # include "cmGlobalBorlandMakefileGenerator.h" # include "cmGlobalJOMMakefileGenerator.h" # include "cmGlobalNMakeMakefileGenerator.h" -# include "cmGlobalVisualStudio11Generator.h" # include "cmGlobalVisualStudio12Generator.h" # include "cmGlobalVisualStudio14Generator.h" # include "cmGlobalVisualStudio9Generator.h" @@ -2507,6 +2507,18 @@ int cmake::ActualConfigure() "Name of generator toolset.", cmStateEnums::INTERNAL); } + if (!this->State->GetInitializedCacheValue( + "CMAKE_CROSSCOMPILING_EMULATOR")) { + cm::optional<std::string> emulator = + cmSystemTools::GetEnvVar("CMAKE_CROSSCOMPILING_EMULATOR"); + if (emulator && !emulator->empty()) { + std::string message = + "Emulator to run executables and tests when cross compiling."; + this->AddCacheEntry("CMAKE_CROSSCOMPILING_EMULATOR", *emulator, message, + cmStateEnums::STRING); + } + } + // reset any system configuration information, except for when we are // InTryCompile. With TryCompile the system info is taken from the parent's // info to save time @@ -2605,7 +2617,6 @@ std::unique_ptr<cmGlobalGenerator> cmake::EvaluateDefaultGlobalGenerator() static VSVersionedGenerator const vsGenerators[] = { { "14.0", "Visual Studio 14 2015" }, // { "12.0", "Visual Studio 12 2013" }, // - { "11.0", "Visual Studio 11 2012" }, // { "9.0", "Visual Studio 9 2008" } }; static const char* const vsEntries[] = { @@ -2990,7 +3001,6 @@ void cmake::AddDefaultGenerators() cmGlobalVisualStudioVersionedGenerator::NewFactory15()); this->Generators.push_back(cmGlobalVisualStudio14Generator::NewFactory()); this->Generators.push_back(cmGlobalVisualStudio12Generator::NewFactory()); - this->Generators.push_back(cmGlobalVisualStudio11Generator::NewFactory()); this->Generators.push_back(cmGlobalVisualStudio9Generator::NewFactory()); this->Generators.push_back(cmGlobalBorlandMakefileGenerator::NewFactory()); this->Generators.push_back(cmGlobalNMakeMakefileGenerator::NewFactory()); @@ -3904,19 +3914,15 @@ std::function<int()> cmake::BuildWorkflowStep( const std::vector<std::string>& args) { cmUVProcessChainBuilder builder; - builder - .AddCommand(args) -# ifdef _WIN32 - .SetExternalStream(cmUVProcessChainBuilder::Stream_OUTPUT, _fileno(stdout)) - .SetExternalStream(cmUVProcessChainBuilder::Stream_ERROR, _fileno(stderr)); -# else - .SetExternalStream(cmUVProcessChainBuilder::Stream_OUTPUT, STDOUT_FILENO) - .SetExternalStream(cmUVProcessChainBuilder::Stream_ERROR, STDERR_FILENO); -# endif + builder.AddCommand(args) + .SetExternalStream(cmUVProcessChainBuilder::Stream_OUTPUT, + cm_fileno(stdout)) + .SetExternalStream(cmUVProcessChainBuilder::Stream_ERROR, + cm_fileno(stderr)); return [builder]() -> int { auto chain = builder.Start(); chain.Wait(); - return static_cast<int>(chain.GetStatus().front()->ExitStatus); + return static_cast<int>(chain.GetStatus(0).ExitStatus); }; } #endif |