summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Help/release/dev/curl-winssl.rst9
-rw-r--r--Modules/FindMPI.cmake2
-rw-r--r--Source/CMakeVersion.cmake2
-rw-r--r--Source/cmComputeLinkDepends.cxx5
-rw-r--r--Source/cmFindPackageCommand.cxx15
-rw-r--r--Source/cmGeneratorExpression.cxx2
-rw-r--r--Source/cmGeneratorExpressionEvaluator.cxx4
-rw-r--r--Source/cmGeneratorExpressionParser.cxx4
-rw-r--r--Source/cmInstallTargetGenerator.cxx2
-rw-r--r--Source/cmTarget.cxx12
-rw-r--r--Tests/CMakeLists.txt2
-rw-r--r--Utilities/cmcurl/CMakeLists.txt6
12 files changed, 41 insertions, 24 deletions
diff --git a/Help/release/dev/curl-winssl.rst b/Help/release/dev/curl-winssl.rst
new file mode 100644
index 0000000..9a28f4f
--- /dev/null
+++ b/Help/release/dev/curl-winssl.rst
@@ -0,0 +1,9 @@
+curl-winssl
+-----------
+
+* On Windows, commands supporting network communication, such as
+ :command:`file(DOWNLOAD)`, :command:`file(UPLOAD)`, and
+ :command:`ctest_submit`, now support SSL/TLS even when CMake
+ is not built against OpenSSL. The Windows native SSL/TLS
+ implementation is used by default. OS-configured certificate
+ authorities will be trusted automatically.
diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake
index 0508579..8e39a7f 100644
--- a/Modules/FindMPI.cmake
+++ b/Modules/FindMPI.cmake
@@ -364,7 +364,7 @@ function (interrogate_mpi_compiler lang try_libs)
endif()
# Extract linker flags from the link command line
- string(REGEX MATCHALL "(^| )-Wl,([^\" ]+|\"[^\"]+\")" MPI_ALL_LINK_FLAGS "${MPI_LINK_CMDLINE}")
+ string(REGEX MATCHALL "(^| )(-Wl,|-Xlinker )([^\" ]+|\"[^\"]+\")" MPI_ALL_LINK_FLAGS "${MPI_LINK_CMDLINE}")
set(MPI_LINK_FLAGS_WORK)
foreach(FLAG ${MPI_ALL_LINK_FLAGS})
if (MPI_LINK_FLAGS_WORK)
diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 60b4644..396ac98 100644
--- a/Source/CMakeVersion.cmake
+++ b/Source/CMakeVersion.cmake
@@ -1,5 +1,5 @@
# CMake version number components.
set(CMake_VERSION_MAJOR 3)
set(CMake_VERSION_MINOR 1)
-set(CMake_VERSION_PATCH 20141212)
+set(CMake_VERSION_PATCH 20141215)
#set(CMake_VERSION_RC 1)
diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx
index 1fb8f30..a636d23 100644
--- a/Source/cmComputeLinkDepends.cxx
+++ b/Source/cmComputeLinkDepends.cxx
@@ -266,9 +266,10 @@ cmComputeLinkDepends::Compute()
// Iterate in reverse order so we can keep only the last occurrence
// of a shared library.
std::set<int> emmitted;
+ const std::vector<int>& cFLO = this->FinalLinkOrder;
for(std::vector<int>::const_reverse_iterator
- li = this->FinalLinkOrder.rbegin(),
- le = this->FinalLinkOrder.rend();
+ li = cFLO.rbegin(),
+ le = cFLO.rend();
li != le; ++li)
{
int i = *li;
diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index 0130006..8410cda 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -80,12 +80,15 @@ void cmFindPackageCommand::AppendSearchPathGroups()
PathLabel::SystemRegistry);
// Create the new path objects
- this->LabeledPaths.insert(std::make_pair(PathLabel::UserRegistry,
- cmSearchPath(this)));
- this->LabeledPaths.insert(std::make_pair(PathLabel::Builds,
- cmSearchPath(this)));
- this->LabeledPaths.insert(std::make_pair(PathLabel::SystemRegistry,
- cmSearchPath(this)));
+ this->LabeledPaths.insert(
+ std::pair<cmFindCommon::PathLabel, cmSearchPath>(
+ PathLabel::UserRegistry, cmSearchPath(this)));
+ this->LabeledPaths.insert(
+ std::pair<cmFindCommon::PathLabel, cmSearchPath>(
+ PathLabel::Builds, cmSearchPath(this)));
+ this->LabeledPaths.insert(
+ std::pair<cmFindCommon::PathLabel, cmSearchPath>(
+ PathLabel::SystemRegistry, cmSearchPath(this)));
}
//----------------------------------------------------------------------------
diff --git a/Source/cmGeneratorExpression.cxx b/Source/cmGeneratorExpression.cxx
index bff6f5f..b6fe414 100644
--- a/Source/cmGeneratorExpression.cxx
+++ b/Source/cmGeneratorExpression.cxx
@@ -447,7 +447,7 @@ std::string cmGeneratorExpression::Preprocess(const std::string &input,
return stripExportInterface(input, context, resolveRelative);
}
- assert(!"cmGeneratorExpression::Preprocess called with invalid args");
+ assert(0 && "cmGeneratorExpression::Preprocess called with invalid args");
return std::string();
}
diff --git a/Source/cmGeneratorExpressionEvaluator.cxx b/Source/cmGeneratorExpressionEvaluator.cxx
index 17adad7..7ddf4d0 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -1429,7 +1429,7 @@ cmPolicies::PolicyStatus statusForTarget(cmTarget const* tgt,
#undef RETURN_POLICY
- assert("!Unreachable code. Not a valid policy");
+ assert(0 && "Unreachable code. Not a valid policy");
return cmPolicies::WARN;
}
@@ -1445,7 +1445,7 @@ cmPolicies::PolicyID policyForString(const char *policy_id)
#undef RETURN_POLICY_ID
- assert("!Unreachable code. Not a valid policy");
+ assert(0 && "Unreachable code. Not a valid policy");
return cmPolicies::CMP0002;
}
diff --git a/Source/cmGeneratorExpressionParser.cxx b/Source/cmGeneratorExpressionParser.cxx
index a41a6e5..ec15daf 100644
--- a/Source/cmGeneratorExpressionParser.cxx
+++ b/Source/cmGeneratorExpressionParser.cxx
@@ -292,11 +292,11 @@ void cmGeneratorExpressionParser::ParseContent(
}
else
{
- assert(!"Got unexpected syntax token.");
+ assert(0 && "Got unexpected syntax token.");
}
assert(this->it != this->Tokens.end());
++this->it;
return;
}
- assert(!"Unhandled token in generator expression.");
+ assert(0 && "Unhandled token in generator expression.");
}
diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx
index d689c89..bb346fb 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -95,7 +95,7 @@ void cmInstallTargetGenerator::GenerateScriptForConfig(std::ostream& os,
case cmTarget::INTERFACE_LIBRARY:
// Not reachable. We never create a cmInstallTargetGenerator for
// an INTERFACE_LIBRARY.
- assert(!"INTERFACE_LIBRARY targets have no installable outputs.");
+ assert(0 && "INTERFACE_LIBRARY targets have no installable outputs.");
break;
case cmTarget::OBJECT_LIBRARY:
case cmTarget::UTILITY:
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index f0957d0..37aa26e 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -4856,7 +4856,7 @@ std::pair<bool, const char*> consistentProperty(const char *lhs,
switch(t)
{
case BoolType:
- assert(!"consistentProperty for strings called with BoolType");
+ assert(0 && "consistentProperty for strings called with BoolType");
return std::pair<bool, const char*>(false, null_ptr);
case StringType:
return consistentStringProperty(lhs, rhs);
@@ -4864,7 +4864,7 @@ std::pair<bool, const char*> consistentProperty(const char *lhs,
case NumberMaxType:
return consistentNumberProperty(lhs, rhs, t);
}
- assert(!"Unreachable!");
+ assert(0 && "Unreachable!");
return std::pair<bool, const char*>(false, null_ptr);
}
@@ -4949,7 +4949,7 @@ std::string compatibilityType(CompatibleType t)
case NumberMinType:
return "Numeric minimum compatibility";
}
- assert(!"Unreachable!");
+ assert(0 && "Unreachable!");
return "";
}
@@ -4965,7 +4965,7 @@ std::string compatibilityAgree(CompatibleType t, bool dominant)
case NumberMinType:
return dominant ? "(Dominant)\n" : "(Ignored)\n";
}
- assert(!"Unreachable!");
+ assert(0 && "Unreachable!");
return "";
}
@@ -6578,7 +6578,7 @@ const char * getLinkInterfaceDependentProperty(cmTarget const* tgt,
switch(t)
{
case BoolType:
- assert(!"String compatibility check function called for boolean");
+ assert(0 && "String compatibility check function called for boolean");
return 0;
case StringType:
return tgt->GetLinkInterfaceDependentStringProperty(prop, config);
@@ -6587,7 +6587,7 @@ const char * getLinkInterfaceDependentProperty(cmTarget const* tgt,
case NumberMaxType:
return tgt->GetLinkInterfaceDependentNumberMaxProperty(prop, config);
}
- assert(!"Unreachable!");
+ assert(0 && "Unreachable!");
return 0;
}
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index fda9359..33c18ce 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -171,7 +171,7 @@ if(BUILD_TESTING)
OUTPUT_VARIABLE OSX_VERSION
OUTPUT_STRIP_TRAILING_WHITESPACE
)
- if(OSX_VERSION MATCHES "^10\\.[0123]" OR OSX_VERSION MATCHES "ProductVersion:\t10\\.[0123]")
+ if(OSX_VERSION VERSION_LESS 10.4)
message(STATUS "Forcing CTEST_TEST_CPACK=OFF on OSX < 10.4")
message(STATUS "OSX_VERSION='${OSX_VERSION}'")
set(CTEST_TEST_CPACK OFF)
diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt
index eaf276b..1092e48 100644
--- a/Utilities/cmcurl/CMakeLists.txt
+++ b/Utilities/cmcurl/CMakeLists.txt
@@ -460,7 +460,11 @@ if(CMAKE_USE_OPENSSL)
add_definitions(-DCURL_CA_BUNDLE="${CURL_CA_BUNDLE}")
endif()
endif(OPENSSL_FOUND)
-endif(CMAKE_USE_OPENSSL)
+elseif(WIN32)
+ # Use Windows SSL/TLS native implementation.
+ add_definitions(-DUSE_SCHANNEL)
+ set(USE_WINDOWS_SSPI 1)
+endif()
#libSSH2
option(CMAKE_USE_LIBSSH2 "Use libSSH2" ON)
generated by cgit v0.12 at 2024-11-11 09:01:15 (GMT)