Merge remote-tracking branch 'origin/maint'
This commit is contained in:
commit
6264a410be
|
@ -1,6 +1,7 @@
|
||||||
set(CMAKE_Fortran_COMPILER "@CMAKE_Fortran_COMPILER@")
|
set(CMAKE_Fortran_COMPILER "@CMAKE_Fortran_COMPILER@")
|
||||||
set(CMAKE_Fortran_COMPILER_ARG1 "@CMAKE_Fortran_COMPILER_ARG1@")
|
set(CMAKE_Fortran_COMPILER_ARG1 "@CMAKE_Fortran_COMPILER_ARG1@")
|
||||||
set(CMAKE_Fortran_COMPILER_ID "@CMAKE_Fortran_COMPILER_ID@")
|
set(CMAKE_Fortran_COMPILER_ID "@CMAKE_Fortran_COMPILER_ID@")
|
||||||
|
set(CMAKE_Fortran_COMPILER_VERSION "@CMAKE_Fortran_COMPILER_VERSION@")
|
||||||
set(CMAKE_Fortran_PLATFORM_ID "@CMAKE_Fortran_PLATFORM_ID@")
|
set(CMAKE_Fortran_PLATFORM_ID "@CMAKE_Fortran_PLATFORM_ID@")
|
||||||
set(CMAKE_Fortran_SIMULATE_ID "@CMAKE_Fortran_SIMULATE_ID@")
|
set(CMAKE_Fortran_SIMULATE_ID "@CMAKE_Fortran_SIMULATE_ID@")
|
||||||
set(CMAKE_Fortran_SIMULATE_VERSION "@CMAKE_Fortran_SIMULATE_VERSION@")
|
set(CMAKE_Fortran_SIMULATE_VERSION "@CMAKE_Fortran_SIMULATE_VERSION@")
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
# CMake version number components.
|
# CMake version number components.
|
||||||
set(CMake_VERSION_MAJOR 3)
|
set(CMake_VERSION_MAJOR 3)
|
||||||
set(CMake_VERSION_MINOR 3)
|
set(CMake_VERSION_MINOR 3)
|
||||||
set(CMake_VERSION_PATCH 0)
|
set(CMake_VERSION_PATCH 1)
|
||||||
#set(CMake_VERSION_RC 0)
|
#set(CMake_VERSION_RC 0)
|
||||||
|
|
|
@ -176,7 +176,7 @@ bool cmCTestAddSubdirectoryCommand
|
||||||
cmSystemTools::ChangeDirectory(cwd);
|
cmSystemTools::ChangeDirectory(cwd);
|
||||||
std::string fname = cwd;
|
std::string fname = cwd;
|
||||||
fname += "/";
|
fname += "/";
|
||||||
fname += args[1];
|
fname += args[0];
|
||||||
|
|
||||||
if ( !cmSystemTools::FileExists(fname.c_str()) )
|
if ( !cmSystemTools::FileExists(fname.c_str()) )
|
||||||
{
|
{
|
||||||
|
|
|
@ -1564,8 +1564,8 @@ void cmMakefile::ConfigureSubDirectory(cmLocalGenerator *lg2)
|
||||||
cmSystemTools::Message(msg.c_str());
|
cmSystemTools::Message(msg.c_str());
|
||||||
}
|
}
|
||||||
|
|
||||||
currentStart += "/CMakeLists.txt";
|
std::string const currentStartFile = currentStart + "/CMakeLists.txt";
|
||||||
if(!cmSystemTools::FileExists(currentStart.c_str(), true))
|
if (!cmSystemTools::FileExists(currentStartFile, true))
|
||||||
{
|
{
|
||||||
// The file is missing. Check policy CMP0014.
|
// The file is missing. Check policy CMP0014.
|
||||||
std::ostringstream e;
|
std::ostringstream e;
|
||||||
|
|
|
@ -243,7 +243,7 @@ void cmXCodeObject::PrintString(std::ostream& os,std::string String)
|
||||||
bool needQuote =
|
bool needQuote =
|
||||||
(String.empty() ||
|
(String.empty() ||
|
||||||
String.find("//") != String.npos ||
|
String.find("//") != String.npos ||
|
||||||
String.find_first_of(" <>+-*=@[](){},") != String.npos);
|
String.find_first_of(" <>+-*=@[](){},~") != String.npos);
|
||||||
const char* quote = needQuote? "\"" : "";
|
const char* quote = needQuote? "\"" : "";
|
||||||
|
|
||||||
// Print the string, quoted and escaped as necessary.
|
// Print the string, quoted and escaped as necessary.
|
||||||
|
|
|
@ -118,6 +118,7 @@ add_RunCMake_test(Syntax)
|
||||||
add_RunCMake_test(add_custom_command)
|
add_RunCMake_test(add_custom_command)
|
||||||
add_RunCMake_test(add_custom_target)
|
add_RunCMake_test(add_custom_target)
|
||||||
add_RunCMake_test(add_dependencies)
|
add_RunCMake_test(add_dependencies)
|
||||||
|
add_RunCMake_test(add_subdirectory)
|
||||||
add_RunCMake_test(build_command)
|
add_RunCMake_test(build_command)
|
||||||
add_RunCMake_test(execute_process)
|
add_RunCMake_test(execute_process)
|
||||||
add_RunCMake_test(export)
|
add_RunCMake_test(export)
|
||||||
|
|
|
@ -0,0 +1,3 @@
|
||||||
|
cmake_minimum_required(VERSION 3.2)
|
||||||
|
project(${RunCMake_TEST} NONE)
|
||||||
|
include(${RunCMake_TEST}.cmake)
|
|
@ -0,0 +1 @@
|
||||||
|
1
|
|
@ -0,0 +1,5 @@
|
||||||
|
^CMake Error at DoesNotExist.cmake:1 \(add_subdirectory\):
|
||||||
|
add_subdirectory given source "DoesNotExist" which is not an existing
|
||||||
|
directory.
|
||||||
|
Call Stack \(most recent call first\):
|
||||||
|
CMakeLists.txt:3 \(include\)$
|
|
@ -0,0 +1 @@
|
||||||
|
add_subdirectory(DoesNotExist)
|
|
@ -0,0 +1 @@
|
||||||
|
1
|
|
@ -0,0 +1,8 @@
|
||||||
|
^CMake Error at Missing.cmake:1 \(add_subdirectory\):
|
||||||
|
The source directory
|
||||||
|
|
||||||
|
.*/Tests/RunCMake/add_subdirectory/Missing
|
||||||
|
|
||||||
|
does not contain a CMakeLists.txt file.
|
||||||
|
Call Stack \(most recent call first\):
|
||||||
|
CMakeLists.txt:3 \(include\)$
|
|
@ -0,0 +1 @@
|
||||||
|
add_subdirectory(Missing)
|
|
@ -0,0 +1,4 @@
|
||||||
|
include(RunCMake)
|
||||||
|
|
||||||
|
run_cmake(DoesNotExist)
|
||||||
|
run_cmake(Missing)
|
Loading…
Reference in New Issue