summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
Diffstat (limited to 'Source')
-rw-r--r--Source/CMakeVersion.cmake2
-rw-r--r--Source/CPack/WiX/cmWIXFilesSourceWriter.cxx1
-rw-r--r--Source/CPack/WiX/cmWIXPatchParser.h2
-rw-r--r--Source/CPack/cmCPackDebGenerator.cxx1
-rw-r--r--Source/CPack/cmCPackSTGZGenerator.cxx4
-rw-r--r--Source/CTest/cmCTestGIT.cxx2
-rw-r--r--Source/CTest/cmCTestP4.cxx2
-rw-r--r--Source/cmCommandArgumentParserHelper.cxx4
-rw-r--r--Source/cmDependsJavaParserHelper.cxx2
-rw-r--r--Source/cmExprParserHelper.cxx2
-rw-r--r--Source/cmFileCommand.cxx4
-rw-r--r--Source/cmGeneratorExpressionEvaluationFile.h2
-rw-r--r--Source/cmPolicies.h2
-rw-r--r--Source/cmRST.cxx16
-rw-r--r--Source/cmRST.h1
-rw-r--r--Source/cmSystemTools.cxx2
-rw-r--r--Source/cmTimestamp.cxx3
-rw-r--r--Source/cmWriteFileCommand.cxx1
-rw-r--r--Source/cmake.cxx3
19 files changed, 38 insertions, 18 deletions
diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index b83cb17..ee11ece 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 5)
-set(CMake_VERSION_PATCH 20160502)
+set(CMake_VERSION_PATCH 20160503)
#set(CMake_VERSION_RC 1)
diff --git a/Source/CPack/WiX/cmWIXFilesSourceWriter.cxx b/Source/CPack/WiX/cmWIXFilesSourceWriter.cxx
index 446ce96..2833d53 100644
--- a/Source/CPack/WiX/cmWIXFilesSourceWriter.cxx
+++ b/Source/CPack/WiX/cmWIXFilesSourceWriter.cxx
@@ -17,6 +17,7 @@
#include <cmInstalledFile.h>
#include <sys/types.h>
+// include sys/stat.h after sys/types.h
#include <sys/stat.h>
cmWIXFilesSourceWriter::cmWIXFilesSourceWriter(cmCPackLog* logger,
diff --git a/Source/CPack/WiX/cmWIXPatchParser.h b/Source/CPack/WiX/cmWIXPatchParser.h
index 42c0787..8ce4026 100644
--- a/Source/CPack/WiX/cmWIXPatchParser.h
+++ b/Source/CPack/WiX/cmWIXPatchParser.h
@@ -17,8 +17,8 @@
#include <cmXMLParser.h>
-#include <map>
#include <list>
+#include <map>
struct cmWIXPatchNode
{
diff --git a/Source/CPack/cmCPackDebGenerator.cxx b/Source/CPack/cmCPackDebGenerator.cxx
index 9e17bc8..794955f 100644
--- a/Source/CPack/cmCPackDebGenerator.cxx
+++ b/Source/CPack/cmCPackDebGenerator.cxx
@@ -761,6 +761,7 @@ std::string cmCPackDebGenerator::GetComponentInstallDirNameSuffix(
*/
#include <sys/types.h>
+// include sys/stat.h after sys/types.h
#include <sys/stat.h>
#include <stdio.h>
diff --git a/Source/CPack/cmCPackSTGZGenerator.cxx b/Source/CPack/cmCPackSTGZGenerator.cxx
index 8a83666..4a8754e 100644
--- a/Source/CPack/cmCPackSTGZGenerator.cxx
+++ b/Source/CPack/cmCPackSTGZGenerator.cxx
@@ -18,8 +18,10 @@
#include "cmSystemTools.h"
#include "cmake.h"
-#include <sys/types.h>
#include <cmsys/FStream.hxx>
+
+#include <sys/types.h>
+// include sys/stat.h after sys/types.h
#include <sys/stat.h>
//----------------------------------------------------------------------
diff --git a/Source/CTest/cmCTestGIT.cxx b/Source/CTest/cmCTestGIT.cxx
index 3ff12c1..19d869c 100644
--- a/Source/CTest/cmCTestGIT.cxx
+++ b/Source/CTest/cmCTestGIT.cxx
@@ -19,8 +19,8 @@
#include <cmsys/Process.h>
#include <cmsys/RegularExpression.hxx>
-#include <sys/types.h>
#include <ctype.h>
+#include <sys/types.h>
#include <time.h>
//----------------------------------------------------------------------------
diff --git a/Source/CTest/cmCTestP4.cxx b/Source/CTest/cmCTestP4.cxx
index f7c960c..b801cfc 100644
--- a/Source/CTest/cmCTestP4.cxx
+++ b/Source/CTest/cmCTestP4.cxx
@@ -17,8 +17,8 @@
#include <cmsys/Process.h>
#include <cmsys/RegularExpression.hxx>
-#include <sys/types.h>
#include <ctype.h>
+#include <sys/types.h>
#include <time.h>
//----------------------------------------------------------------------------
diff --git a/Source/cmCommandArgumentParserHelper.cxx b/Source/cmCommandArgumentParserHelper.cxx
index 15ab746..0b2fd81 100644
--- a/Source/cmCommandArgumentParserHelper.cxx
+++ b/Source/cmCommandArgumentParserHelper.cxx
@@ -11,10 +11,10 @@
============================================================================*/
#include "cmCommandArgumentParserHelper.h"
-#include "cmSystemTools.h"
#include "cmMakefile.h"
-#include "cmState.h"
#include "cmOutputConverter.h"
+#include "cmState.h"
+#include "cmSystemTools.h"
#include "cmCommandArgumentLexer.h"
diff --git a/Source/cmDependsJavaParserHelper.cxx b/Source/cmDependsJavaParserHelper.cxx
index 3c02325..51a1cb4 100644
--- a/Source/cmDependsJavaParserHelper.cxx
+++ b/Source/cmDependsJavaParserHelper.cxx
@@ -11,8 +11,8 @@
============================================================================*/
#include "cmDependsJavaParserHelper.h"
-#include "cmSystemTools.h"
#include "cmDependsJavaLexer.h"
+#include "cmSystemTools.h"
#include <cmsys/FStream.hxx>
int cmDependsJava_yyparse( yyscan_t yyscanner );
diff --git a/Source/cmExprParserHelper.cxx b/Source/cmExprParserHelper.cxx
index 6016c4c..c5ecde4 100644
--- a/Source/cmExprParserHelper.cxx
+++ b/Source/cmExprParserHelper.cxx
@@ -11,8 +11,8 @@
============================================================================*/
#include "cmExprParserHelper.h"
-#include "cmSystemTools.h"
#include "cmMakefile.h"
+#include "cmSystemTools.h"
#include "cmExprLexer.h"
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx
index 035b97f..575051e 100644
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@ -28,8 +28,10 @@
#endif
#undef GetCurrentDirectory
-#include <sys/types.h>
#include <assert.h>
+
+#include <sys/types.h>
+// include sys/stat.h after sys/types.h
#include <sys/stat.h>
#include <cmsys/Directory.hxx>
diff --git a/Source/cmGeneratorExpressionEvaluationFile.h b/Source/cmGeneratorExpressionEvaluationFile.h
index f34dadc..b8c824b 100644
--- a/Source/cmGeneratorExpressionEvaluationFile.h
+++ b/Source/cmGeneratorExpressionEvaluationFile.h
@@ -14,8 +14,8 @@
#include "cmGeneratorExpression.h"
-#include <sys/types.h>
#include <cmsys/auto_ptr.hxx>
+#include <sys/types.h>
class cmLocalGenerator;
diff --git a/Source/cmPolicies.h b/Source/cmPolicies.h
index 5023055..dbea895 100644
--- a/Source/cmPolicies.h
+++ b/Source/cmPolicies.h
@@ -204,7 +204,7 @@ class cmPolicy;
"Ninja requires custom command byproducts to be explicit.", \
3, 3, 0, cmPolicies::WARN) \
SELECT(POLICY, CMP0059, \
- "Do no treat DEFINITIONS as a built-in directory property.", \
+ "Do not treat DEFINITIONS as a built-in directory property.", \
3, 3, 0, cmPolicies::WARN) \
SELECT(POLICY, CMP0060, \
"Link libraries by full path even in implicit directories.", \
diff --git a/Source/cmRST.cxx b/Source/cmRST.cxx
index 67667ea..44d4289 100644
--- a/Source/cmRST.cxx
+++ b/Source/cmRST.cxx
@@ -46,7 +46,8 @@ cmRST::cmRST(std::ostream& os, std::string const& docroot):
"):`(<*([^`<]|[^` \t]<)*)([ \t]+<[^`]*>)?`"),
Substitution("(^|[^A-Za-z0-9_])"
"((\\|[^| \t\r\n]([^|\r\n]*[^| \t\r\n])?\\|)(__|_|))"
- "([^A-Za-z0-9_]|$)")
+ "([^A-Za-z0-9_]|$)"),
+ TocTreeLink("^.*[ \t]+<([^>]+)>$")
{
this->Replace["|release|"] = cmVersion::GetCMakeVersion();
}
@@ -429,9 +430,18 @@ void cmRST::ProcessDirectiveTocTree()
for(std::vector<std::string>::iterator i = this->MarkupLines.begin();
i != this->MarkupLines.end(); ++i)
{
- if(!i->empty() && i->find_first_of(":") == i->npos)
+ std::string const& line = *i;
+ if (!line.empty() && line[0] != ':')
{
- this->ProcessInclude(*i + ".rst", IncludeTocTree);
+ if (this->TocTreeLink.find(line))
+ {
+ std::string const& link = this->TocTreeLink.match(1);
+ this->ProcessInclude(link + ".rst", IncludeTocTree);
+ }
+ else
+ {
+ this->ProcessInclude(line + ".rst", IncludeTocTree);
+ }
}
}
}
diff --git a/Source/cmRST.h b/Source/cmRST.h
index b9b2366..098afab 100644
--- a/Source/cmRST.h
+++ b/Source/cmRST.h
@@ -89,6 +89,7 @@ private:
cmsys::RegularExpression ModuleRST;
cmsys::RegularExpression CMakeRole;
cmsys::RegularExpression Substitution;
+ cmsys::RegularExpression TocTreeLink;
std::vector<std::string> MarkupLines;
std::string DocDir;
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 3177a84..68c1eb8 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -42,8 +42,8 @@
// include wincrypt.h after windows.h
# include <wincrypt.h>
#else
-# include <sys/types.h>
# include <sys/time.h>
+# include <sys/types.h>
# include <sys/wait.h>
# include <unistd.h>
# include <utime.h>
diff --git a/Source/cmTimestamp.cxx b/Source/cmTimestamp.cxx
index 7d1ba32..b5c9d8e 100644
--- a/Source/cmTimestamp.cxx
+++ b/Source/cmTimestamp.cxx
@@ -13,9 +13,10 @@
#include <cstdlib>
#include <cstring>
+#include <sstream>
#include <sys/types.h>
-#include <sstream>
+// include sys/stat.h after sys/types.h
#include <sys/stat.h>
//----------------------------------------------------------------------------
diff --git a/Source/cmWriteFileCommand.cxx b/Source/cmWriteFileCommand.cxx
index d52d6b5..c4468f3 100644
--- a/Source/cmWriteFileCommand.cxx
+++ b/Source/cmWriteFileCommand.cxx
@@ -14,6 +14,7 @@
#include <cmsys/FStream.hxx>
#include <sys/types.h>
+// include sys/stat.h after sys/types.h
#include <sys/stat.h>
// cmLibraryCommand
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index da6e59e..f176cc1 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -99,11 +99,12 @@
# include "cmGlobalXCodeGenerator.h"
# define CMAKE_USE_XCODE 1
# endif
-# include <sys/types.h>
# include <sys/resource.h>
# include <sys/time.h>
#endif
+#include <sys/types.h>
+// include sys/stat.h after sys/types.h
#include <sys/stat.h> // struct stat
#include <list>
generated by cgit v0.12 at 2025-01-08 19:51:43 (GMT)