[Cmake-commits] CMake branch, master, updated. v3.1.0-rc1-118-g38be87c
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake". The branch, master has been updated via 38be87caa4c1470151d012e46c70f09bcbe7d334 (commit) from 40bab8d17b18ca5e6864bf282326507c59826021 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=38be87caa4c1470151d012e46c70f09bcbe7d334 commit 38be87caa4c1470151d012e46c70f09bcbe7d334 Author: Kitware Robot AuthorDate: Tue Nov 4 00:01:09 2014 -0500 Commit: Kitware Robot CommitDate: Tue Nov 4 00:01:09 2014 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 954bfaa..4743c2e 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 20141103) +set(CMake_VERSION_PATCH 20141104) #set(CMake_VERSION_RC 1) --- Summary of changes: Source/CMakeVersion.cmake |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-288-gbd34ac8
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via bd34ac897765254bdab60c8c0a28d968f78b46d3 (commit)
via 996f822930b02fbf6f7b1bc2fa21ad52b10ebdcd (commit)
from 99bf0b1ef2d509ead3d2ab7238dced2a3c37f659 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bd34ac897765254bdab60c8c0a28d968f78b46d3
commit bd34ac897765254bdab60c8c0a28d968f78b46d3
Merge: 99bf0b1 996f822
Author: Chuck Atkins
AuthorDate: Mon Nov 3 14:45:01 2014 -0500
Commit: CMake Topic Stage
CommitDate: Mon Nov 3 14:45:01 2014 -0500
Merge topic 'fix-missing-SIZE_MAX' into next
996f8229 liblzma: fix build on platforms with no SIZE_MAX defined.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=996f822930b02fbf6f7b1bc2fa21ad52b10ebdcd
commit 996f822930b02fbf6f7b1bc2fa21ad52b10ebdcd
Author: Chuck Atkins
AuthorDate: Mon Nov 3 14:37:12 2014 -0500
Commit: Chuck Atkins
CommitDate: Mon Nov 3 14:37:12 2014 -0500
liblzma: fix build on platforms with no SIZE_MAX defined.
Some systems don't define a SIZE_MAX (older versions of HP-UX with aCC).
The logic was already in place to account for this condition but
SIZEOF_SIZE_T was not getting cmoputed at configure time to allow it to
function. This computes sizeof(size_t) at configure time to allow the
appropriate logic to work. It also changes SIZEOF_SIZE_T to SIZE_OF_SIZE_T
for consistency.
diff --git a/Utilities/cmliblzma/CMakeLists.txt
b/Utilities/cmliblzma/CMakeLists.txt
index c03147f..d991438 100644
--- a/Utilities/cmliblzma/CMakeLists.txt
+++ b/Utilities/cmliblzma/CMakeLists.txt
@@ -95,6 +95,7 @@ CHECK_TYPE_SIZE("unsigned short" SIZE_OF_UNSIGNED_SHORT)
CHECK_TYPE_SIZE("unsigned" SIZE_OF_UNSIGNED)
CHECK_TYPE_SIZE("unsigned long" SIZE_OF_UNSIGNED_LONG)
CHECK_TYPE_SIZE("unsigned long long" SIZE_OF_UNSIGNED_LONG_LONG)
+CHECK_TYPE_SIZE("size_t" SIZE_OF_SIZE_T)
CHECK_TYPE_SIZE("__int64" __INT64)
CHECK_TYPE_SIZE("unsigned __int64" UNSIGNED___INT64)
diff --git a/Utilities/cmliblzma/common/sysdefs.h
b/Utilities/cmliblzma/common/sysdefs.h
index c84f01c..a6edea8 100644
--- a/Utilities/cmliblzma/common/sysdefs.h
+++ b/Utilities/cmliblzma/common/sysdefs.h
@@ -124,9 +124,9 @@
// The code currently assumes that size_t is either 32-bit or 64-bit.
#ifndef SIZE_MAX
-# if SIZEOF_SIZE_T == 4
+# if SIZE_OF_SIZE_T == 4
# define SIZE_MAX UINT32_MAX
-# elif SIZEOF_SIZE_T == 8
+# elif SIZE_OF_SIZE_T == 8
# define SIZE_MAX UINT64_MAX
# else
# error size_t is not 32-bit or 64-bit
diff --git a/Utilities/cmliblzma/config.h.in b/Utilities/cmliblzma/config.h.in
index b197f27..017c435 100644
--- a/Utilities/cmliblzma/config.h.in
+++ b/Utilities/cmliblzma/config.h.in
@@ -29,6 +29,7 @@
@SIZE_OF_UNSIGNED_CODE@
@SIZE_OF_UNSIGNED_LONG_CODE@
@SIZE_OF_UNSIGNED_LONG_LONG_CODE@
+@SIZE_OF_SIZE_T_CODE@
/*
* If we lack int64_t, define it to the first of __int64, int, long, and long
long
@@ -277,9 +278,6 @@ typedef uint64_t uintmax_t;
/* Define to 1 if the system has the type `_Bool'. */
#cmakedefine HAVE__BOOL 1
-/* The size of `size_t', as computed by sizeof. */
-#cmakedefine SIZEOF_SIZE_T @SIZEOF_SIZE_T@
-
/* Define to 1 if the system supports fast unaligned access to 16-bit and
32-bit integers. */
#define TUKLIB_FAST_UNALIGNED_ACCESS 1
---
Summary of changes:
Utilities/cmliblzma/CMakeLists.txt |1 +
Utilities/cmliblzma/common/sysdefs.h |4 ++--
Utilities/cmliblzma/config.h.in |4 +---
3 files changed, 4 insertions(+), 5 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-286-g99bf0b1
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 99bf0b1ef2d509ead3d2ab7238dced2a3c37f659 (commit)
via df15f0f69436264e9e6160a42a2368369d78b740 (commit)
from 0d367b05485e89386f9c60584688b737ba62fc0b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=99bf0b1ef2d509ead3d2ab7238dced2a3c37f659
commit 99bf0b1ef2d509ead3d2ab7238dced2a3c37f659
Merge: 0d367b0 df15f0f
Author: Stephen Kelly
AuthorDate: Mon Nov 3 13:09:15 2014 -0500
Commit: CMake Topic Stage
CommitDate: Mon Nov 3 13:09:15 2014 -0500
Merge topic 'file-GENERATE-permissions' into next
df15f0f6 file(GENERATE): Use permissions of input file if present.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=df15f0f69436264e9e6160a42a2368369d78b740
commit df15f0f69436264e9e6160a42a2368369d78b740
Author: Stephen Kelly
AuthorDate: Tue Jul 22 15:10:57 2014 +0200
Commit: Stephen Kelly
CommitDate: Mon Nov 3 19:08:28 2014 +0100
file(GENERATE): Use permissions of input file if present.
diff --git a/Source/cmGeneratorExpressionEvaluationFile.cxx
b/Source/cmGeneratorExpressionEvaluationFile.cxx
index f9067cf..3a8dc48 100644
--- a/Source/cmGeneratorExpressionEvaluationFile.cxx
+++ b/Source/cmGeneratorExpressionEvaluationFile.cxx
@@ -36,7 +36,7 @@
cmGeneratorExpressionEvaluationFile::cmGeneratorExpressionEvaluationFile(
//
void cmGeneratorExpressionEvaluationFile::Generate(const std::string& config,
cmCompiledGeneratorExpression* inputExpression,
- std::map &outputFiles)
+ std::map &outputFiles, mode_t perm)
{
std::string rawCondition = this->Condition->GetInput();
if (!rawCondition.empty())
@@ -83,11 +83,16 @@ void cmGeneratorExpressionEvaluationFile::Generate(const
std::string& config,
cmGeneratedFileStream fout(outputFileName.c_str());
fout.SetCopyIfDifferent(true);
fout << outputContent;
+ if (fout.Close() && perm)
+{
+cmSystemTools::SetPermissions(outputFileName.c_str(), perm);
+}
}
//
void cmGeneratorExpressionEvaluationFile::Generate()
{
+ mode_t perm = 0;
std::string inputContent;
if (this->InputIsContent)
{
@@ -95,6 +100,7 @@ void cmGeneratorExpressionEvaluationFile::Generate()
}
else
{
+cmSystemTools::GetPermissions(this->Input.c_str(), perm);
cmsys::ifstream fin(this->Input.c_str());
if(!fin)
{
@@ -131,7 +137,7 @@ void cmGeneratorExpressionEvaluationFile::Generate()
for(std::vector::const_iterator li = allConfigs.begin();
li != allConfigs.end(); ++li)
{
-this->Generate(*li, inputExpression.get(), outputFiles);
+this->Generate(*li, inputExpression.get(), outputFiles, perm);
if(cmSystemTools::GetFatalErrorOccured())
{
return;
diff --git a/Source/cmGeneratorExpressionEvaluationFile.h
b/Source/cmGeneratorExpressionEvaluationFile.h
index f939916..4e87a88 100644
--- a/Source/cmGeneratorExpressionEvaluationFile.h
+++ b/Source/cmGeneratorExpressionEvaluationFile.h
@@ -34,7 +34,7 @@ public:
private:
void Generate(const std::string& config,
cmCompiledGeneratorExpression* inputExpression,
- std::map &outputFiles);
+ std::map &outputFiles, mode_t perm);
private:
const std::string Input;
---
Summary of changes:
Source/cmGeneratorExpressionEvaluationFile.cxx | 10 --
Source/cmGeneratorExpressionEvaluationFile.h |2 +-
2 files changed, 9 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-284-g0d367b0
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake". The branch, next has been updated via 0d367b05485e89386f9c60584688b737ba62fc0b (commit) via 01fb3190f2070e3e747bbeca3ec9f797d4ebe774 (commit) from ef1dba5e8d56295285bd424e875b4fcdcae6f456 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0d367b05485e89386f9c60584688b737ba62fc0b commit 0d367b05485e89386f9c60584688b737ba62fc0b Merge: ef1dba5 01fb319 Author: Brad King AuthorDate: Mon Nov 3 11:39:00 2014 -0500 Commit: CMake Topic Stage CommitDate: Mon Nov 3 11:39:00 2014 -0500 Merge topic 'FindIce-no-envvar-markup' into next 01fb3190 FindIce: Drop use of :envvar: Sphinx markup http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=01fb3190f2070e3e747bbeca3ec9f797d4ebe774 commit 01fb3190f2070e3e747bbeca3ec9f797d4ebe774 Author: Brad King AuthorDate: Mon Nov 3 10:50:48 2014 -0500 Commit: Brad King CommitDate: Mon Nov 3 10:53:47 2014 -0500 FindIce: Drop use of :envvar: Sphinx markup We do not use it elsewhere yet, and do not want to index environment variables inconsistently. diff --git a/Modules/FindIce.cmake b/Modules/FindIce.cmake index 55528b8..76cecc1 100644 --- a/Modules/FindIce.cmake +++ b/Modules/FindIce.cmake @@ -43,7 +43,7 @@ # # Ice_HOME - the root of the Ice installation # -# The environment variable :envvar:`ICE_HOME` may also be used; the +# The environment variable ``ICE_HOME`` may also be used; the # Ice_HOME variable takes precedence. # # The following cache variables may also be set:: --- Summary of changes: Modules/FindIce.cmake |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-282-gef1dba5
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via ef1dba5e8d56295285bd424e875b4fcdcae6f456 (commit)
via 67cfbf8eb7cb2ad0e177b68aa134bc65297929fb (commit)
via f598f1aa836f7c9a60bc59b53ebbc2faae24f5a4 (commit)
via 4ae133e09c763beb5a55302fdc1502abff6ff8d3 (commit)
from 02309bcd679cc46e18df15919fc69402514cbf04 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ef1dba5e8d56295285bd424e875b4fcdcae6f456
commit ef1dba5e8d56295285bd424e875b4fcdcae6f456
Merge: 02309bc 67cfbf8
Author: Daniele E. Domenichelli
AuthorDate: Mon Nov 3 10:17:33 2014 -0500
Commit: CMake Topic Stage
CommitDate: Mon Nov 3 10:17:33 2014 -0500
Merge topic 'ExternalProject_independent-step-targets' into next
67cfbf8e ExternalProject: Add unit tests
f598f1aa ExternalProject: Add ExternalProject_Add_StepDependencies function
4ae133e0 ExternalProject: Add independent step targets
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=67cfbf8eb7cb2ad0e177b68aa134bc65297929fb
commit 67cfbf8eb7cb2ad0e177b68aa134bc65297929fb
Author: Daniele E. Domenichelli
AuthorDate: Mon Nov 3 16:14:54 2014 +0100
Commit: Daniele E. Domenichelli
CommitDate: Mon Nov 3 16:15:14 2014 +0100
ExternalProject: Add unit tests
diff --git a/Tests/ExternalProjectUpdate/CMakeLists.txt
b/Tests/ExternalProjectUpdate/CMakeLists.txt
index c33e90b..582b0a8 100644
--- a/Tests/ExternalProjectUpdate/CMakeLists.txt
+++ b/Tests/ExternalProjectUpdate/CMakeLists.txt
@@ -19,6 +19,7 @@ set(base "${CMAKE_BINARY_DIR}/CMakeExternals")
set(binary_base "${base}/Build")
set_property(DIRECTORY PROPERTY EP_BASE ${base})
set_property(DIRECTORY PROPERTY EP_STEP_TARGETS configure build test)
+set_property(DIRECTORY PROPERTY EP_INDEPENDENT_STEP_TARGETS update)
set(do_git_tests 0)
@@ -68,8 +69,8 @@ if(do_git_tests)
CMAKE_GENERATOR "${CMAKE_GENERATOR}"
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=
INSTALL_COMMAND ""
-DEPENDS "SetupLocalGITRepository"
)
+ ExternalProject_Add_StepDependencies(${proj} download
SetupLocalGITRepository)
set_property(TARGET ${proj} PROPERTY FOLDER "GIT")
endif()
diff --git a/Tests/RunCMake/ExternalProject/Add_StepDependencies.cmake
b/Tests/RunCMake/ExternalProject/Add_StepDependencies.cmake
new file mode 100644
index 000..38683f1
--- /dev/null
+++ b/Tests/RunCMake/ExternalProject/Add_StepDependencies.cmake
@@ -0,0 +1,20 @@
+cmake_minimum_required(VERSION ${CMAKE_VERSION})
+
+include(ExternalProject)
+
+ExternalProject_Add(BAR URL https://cmake.org/bar.tar.gz)
+
+ExternalProject_Add(FOO URL https://cmake.org/foo.tar.gz STEP_TARGETS update)
+ExternalProject_Add_Step(FOO do_something COMMAND ${CMAKE_COMMAND} -E echo
"Doing something")
+ExternalProject_Add_Step(FOO do_something_else COMMAND ${CMAKE_COMMAND} -E
echo "Doing something else")
+ExternalProject_Add_StepTargets(FOO do_something)
+
+# download and do_something_else are not targets, but the file-level
+# dependency are set.
+ExternalProject_Add_StepDependencies(FOO download BAR)
+ExternalProject_Add_StepDependencies(FOO do_something_else BAR)
+
+# update and do_something are targets, therefore both file-level and
+# target-level dependencies are set.
+ExternalProject_Add_StepDependencies(FOO update BAR)
+ExternalProject_Add_StepDependencies(FOO do_something BAR)
diff --git
a/Tests/RunCMake/ExternalProject/Add_StepDependencies_no_target.cmake
b/Tests/RunCMake/ExternalProject/Add_StepDependencies_no_target.cmake
new file mode 100644
index 000..264c3f0
--- /dev/null
+++ b/Tests/RunCMake/ExternalProject/Add_StepDependencies_no_target.cmake
@@ -0,0 +1,10 @@
+cmake_minimum_required(VERSION ${CMAKE_VERSION})
+
+include(ExternalProject)
+
+ExternalProject_Add(BAR URL https://cmake.org/bar.tar.gz)
+
+ExternalProject_Add(FOO URL https://cmake.org/foo.tar.gz STEP_TARGETS update)
+ExternalProject_Add_Step(FOO do_something COMMAND ${CMAKE_COMMAND} -E echo
"Doing something")
+ExternalProject_Add_Step(FOO do_something_else COMMAND ${CMAKE_COMMAND} -E
echo "Doing something else")
+ExternalProject_Add_StepTargets(FOO do_something)
diff --git a/Tests/RunCMake/ExternalProject/NO_DEPENDS-stderr.txt
b/Tests/RunCMake/ExternalProject/NO_DEPENDS-stderr.txt
new file mode 100644
index 000..4cb051d
--- /dev/null
+++ b/Tests/RunCMake/ExternalProject/NO_DEPENDS-stderr.txt
@@ -0,0 +1,36 @@
+CMake Warning \(dev\) at .*/Modules/ExternalProject.cmake:[0-9]+. \(message\):
+ Using NO_DEPENDS for "configure" step might break parallel builds
+Call Stack \(most recent call first\):
+ .*/Modules/ExternalProject.cmake:[0-9]+ \(ExternalProject_
[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-278-g02309bc
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 02309bcd679cc46e18df15919fc69402514cbf04 (commit)
via ee2e0b3e765652061c868f27b34787a518002979 (commit)
from f4ec141fdd72f19942322b6ed836f12be3117c7f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=02309bcd679cc46e18df15919fc69402514cbf04
commit 02309bcd679cc46e18df15919fc69402514cbf04
Merge: f4ec141 ee2e0b3
Author: Brad King
AuthorDate: Mon Nov 3 09:38:48 2014 -0500
Commit: CMake Topic Stage
CommitDate: Mon Nov 3 09:38:48 2014 -0500
Merge topic 'refactor-search-path-construction' into next
ee2e0b3e Revert topic 'refactor-search-path-construction'
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ee2e0b3e765652061c868f27b34787a518002979
commit ee2e0b3e765652061c868f27b34787a518002979
Author: Brad King
AuthorDate: Mon Nov 3 09:38:24 2014 -0500
Commit: Brad King
CommitDate: Mon Nov 3 09:38:24 2014 -0500
Revert topic 'refactor-search-path-construction'
It will be restored after fixing more dashboard trouble.
diff --git a/Source/cmBootstrapCommands1.cxx b/Source/cmBootstrapCommands1.cxx
index 5502609..9093579 100644
--- a/Source/cmBootstrapCommands1.cxx
+++ b/Source/cmBootstrapCommands1.cxx
@@ -52,8 +52,6 @@
#include "cmFindProgramCommand.cxx"
#include "cmForEachCommand.cxx"
#include "cmFunctionCommand.cxx"
-#include "cmPathLabel.cxx"
-#include "cmSearchPath.cxx"
void GetBootstrapCommands1(std::list& commands)
{
diff --git a/Source/cmFindBase.cxx b/Source/cmFindBase.cxx
index beb6dde..e4e819a 100644
--- a/Source/cmFindBase.cxx
+++ b/Source/cmFindBase.cxx
@@ -140,11 +140,11 @@ bool cmFindBase::ParseArguments(std::vector
const& argsIn)
}
else if(doing == DoingPaths)
{
- this->UserGuessArgs.push_back(args[j]);
+ this->AddUserPath(args[j], this->UserPaths);
}
else if(doing == DoingHints)
{
- this->UserHintsArgs.push_back(args[j]);
+ this->AddUserPath(args[j], this->UserHints);
}
else if(doing == DoingPathSuffixes)
{
@@ -186,11 +186,16 @@ bool cmFindBase::ParseArguments(std::vector
const& argsIn)
this->Names.push_back(shortArgs[0]);
for(unsigned int j = 1; j < shortArgs.size(); ++j)
{
- this->UserGuessArgs.push_back(shortArgs[j]);
+ this->AddUserPath(shortArgs[j], this->UserPaths);
}
}
this->ExpandPaths();
+ // Filter out ignored paths from the prefix list
+ std::set ignored;
+ this->GetIgnoredPaths(ignored);
+ this->FilterPaths(this->SearchPaths, ignored);
+
this->ComputeFinalPaths();
return true;
@@ -198,142 +203,226 @@ bool
cmFindBase::ParseArguments(std::vector const& argsIn)
void cmFindBase::ExpandPaths()
{
- if(!this->NoDefaultPath)
+ this->AddCMakeVariablePath();
+ this->AddCMakeEnvironmentPath();
+ this->AddUserHintsPath();
+ this->AddSystemEnvironmentPath();
+ this->AddCMakeSystemVariablePath();
+ this->AddUserGuessPath();
+
+ // Add suffixes and clean up paths.
+ this->AddPathSuffixes();
+}
+
+//
+void cmFindBase::AddPrefixPaths(std::vector const& in_paths,
+PathType pathType)
+{
+ // default for programs
+ std::string subdir = "bin";
+
+ if (this->CMakePathName == "INCLUDE")
+{
+subdir = "include";
+}
+ else if (this->CMakePathName == "LIBRARY")
{
-if(!this->NoCMakePath)
+subdir = "lib";
+}
+ else if (this->CMakePathName == "FRAMEWORK")
+{
+subdir = ""; // ? what to do for frameworks ?
+}
+
+ for(std::vector::const_iterator it = in_paths.begin();
+ it != in_paths.end(); ++it)
+{
+std::string dir = *it;
+if(!subdir.empty() && !dir.empty() && dir[dir.size()-1] != '/')
+ {
+ dir += "/";
+ }
+if(subdir == "include" || subdir == "lib")
{
- this->FillCMakeVariablePath();
+ const char* arch =
+this->Makefile->GetDefinition("CMAKE_LIBRARY_ARCHITECTURE");
+ if(arch && *arch)
+{
+this->AddPathInternal(dir+subdir+"/"+arch, pathType);
+}
}
-if(!this->NoCMakeEnvironmentPath)
+std::string add = dir + subdir;
+if(add != "/")
{
- this->FillCMakeEnvironmentPath();
+ this->AddPathInternal(add, pathType);
}
-if(!this->NoSystemEnvironmentPath)
+if (subdir == "bin")
{
- this->FillSystemEnvironmentPath();
+ this->AddPathInternal(dir+"sbin", pathType);
}
-if(!this->NoCMakeSystemPath)
+if(!subdir.empty() && *it != "/")
{
- this->
[Cmake-commits] CMake branch, master, updated. v3.1.0-rc1-117-g40bab8d
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake". The branch, master has been updated via 40bab8d17b18ca5e6864bf282326507c59826021 (commit) via a72ff020db5be1a38effeda899908e24d92cea87 (commit) from 6aa2d4773701d5b491c44e2c0eda202b46b36521 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - --- Summary of changes: hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-276-gf4ec141
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake". The branch, next has been updated via f4ec141fdd72f19942322b6ed836f12be3117c7f (commit) via 40bab8d17b18ca5e6864bf282326507c59826021 (commit) via a72ff020db5be1a38effeda899908e24d92cea87 (commit) from 3c8a4f04e5d80cadf479536a5ab8f65fcf4a872c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f4ec141fdd72f19942322b6ed836f12be3117c7f commit f4ec141fdd72f19942322b6ed836f12be3117c7f Merge: 3c8a4f0 40bab8d Author: Brad King AuthorDate: Mon Nov 3 09:36:57 2014 -0500 Commit: Brad King CommitDate: Mon Nov 3 09:36:57 2014 -0500 Merge branch 'master' into next --- Summary of changes: hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, release, updated. v3.1.0-rc1-11-ga72ff02
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake". The branch, release has been updated via a72ff020db5be1a38effeda899908e24d92cea87 (commit) via 4abbb1400d81e1288cdf1e2f708eaa938f7b3955 (commit) via bd7ba8e25f0bc2d57bc162d2d945e10bad29a327 (commit) via e9282782e489a78de9c2896ee01fdd02ce8ca396 (commit) from aa0f6e83093486b0e7276aaddf5bf95f7c8419ce (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - --- Summary of changes: Help/manual/cmake-packages.7.rst |2 +- Modules/Qt4Macros.cmake |2 +- Source/kwsys/CMakeLists.txt |2 +- 3 files changed, 3 insertions(+), 3 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-273-g3c8a4f0
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 3c8a4f04e5d80cadf479536a5ab8f65fcf4a872c (commit)
via 5868b4e2fb7aa7de34403cae7dbc7a827d70a8e8 (commit)
via 72b5b48040ed65fdb54b8ffeb3326b456586b8c8 (commit)
from 8d71f4b52946e409c18f2a6a05a66baa5160a3a2 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3c8a4f04e5d80cadf479536a5ab8f65fcf4a872c
commit 3c8a4f04e5d80cadf479536a5ab8f65fcf4a872c
Merge: 8d71f4b 5868b4e
Author: Brad King
AuthorDate: Mon Nov 3 09:30:35 2014 -0500
Commit: CMake Topic Stage
CommitDate: Mon Nov 3 09:30:35 2014 -0500
Merge topic 'update-kwsys' into next
5868b4e2 Merge branch 'upstream-kwsys' into update-kwsys
72b5b480 KWSys 2014-10-31 (88c8cc7f)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5868b4e2fb7aa7de34403cae7dbc7a827d70a8e8
commit 5868b4e2fb7aa7de34403cae7dbc7a827d70a8e8
Merge: 8b16e62 72b5b48
Author: Brad King
AuthorDate: Fri Oct 31 13:11:58 2014 -0400
Commit: Brad King
CommitDate: Fri Oct 31 13:11:58 2014 -0400
Merge branch 'upstream-kwsys' into update-kwsys
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=72b5b48040ed65fdb54b8ffeb3326b456586b8c8
commit 72b5b48040ed65fdb54b8ffeb3326b456586b8c8
Author: KWSys Robot
AuthorDate: Fri Oct 31 13:09:11 2014 -0400
Commit: Brad King
CommitDate: Fri Oct 31 13:11:53 2014 -0400
KWSys 2014-10-31 (88c8cc7f)
Extract upstream KWSys using the following shell commands.
$ git archive --prefix=upstream-kwsys/ 88c8cc7f | tar x
$ git shortlog --no-merges --abbrev=8 --format='%h %s' 29ffaf43..88c8cc7f
Ben Boeckel (11):
9bf03363 Avoid if() quoted auto-dereference
771e0f22 DynamicLoader: use strings for arguments
86e20d68 Directory: remove extra define
6cc24510 SystemTools: use strings in environment functions
bab5b1f2 SystemTools: add string overload for ReplaceString
f3fb01cf SystemTools: use strings for path-related APIs
0dfbe56d SystemTools: use strings for making C identifiers
4690fc8d SystemTools: use strings in registry function
1b762a41 SystemTools: search for characters
4a060347 SystemInformation: use %ls for WCHAR* format specifiers
d31f7b12 SystemTools: remove unused variable
Brad King (1):
88c8cc7f Fix configure_file call to use COPYONLY, not COPY_ONLY
Clinton Stimpson (1):
5bf91dda SystemTools: Use extended length path for copying files.
Change-Id: I16e8e55dea1c171c04f9c7d04ae3c575531097c3
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8ca4360..2292d64 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -265,7 +265,7 @@ STRING(COMPARE EQUAL "${PROJECT_SOURCE_DIR}"
"${PROJECT_BINARY_DIR}"
KWSYS_IN_SOURCE_BUILD)
IF(NOT KWSYS_IN_SOURCE_BUILD)
CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/kwsysPrivate.h
-${PROJECT_BINARY_DIR}/kwsysPrivate.h COPY_ONLY IMMEDIATE)
+${PROJECT_BINARY_DIR}/kwsysPrivate.h COPYONLY IMMEDIATE)
ENDIF(NOT KWSYS_IN_SOURCE_BUILD)
# Select plugin module file name convention.
@@ -1075,7 +1075,7 @@ ENDIF(KWSYS_ENABLE_C AND KWSYS_C_SRCS)
ADD_DEFINITIONS("-DKWSYS_NAMESPACE=${KWSYS_NAMESPACE}")
# Disable deprecation warnings for standard C functions.
-IF(MSVC OR (WIN32 AND "${CMAKE_C_COMPILER_ID}" MATCHES "^(Intel)$"))
+IF(MSVC OR (WIN32 AND CMAKE_C_COMPILER_ID STREQUAL "Intel"))
ADD_DEFINITIONS(
-D_CRT_NONSTDC_NO_DEPRECATE
-D_CRT_SECURE_NO_DEPRECATE
@@ -1232,7 +1232,7 @@ IF(KWSYS_STANDALONE OR CMake_SOURCE_DIR)
ENDFOREACH(n)
# Some Apple compilers produce bad optimizations in this source.
-IF(APPLE AND "${CMAKE_C_COMPILER_ID}" MATCHES "^(GNU|LLVM)$")
+IF(APPLE AND CMAKE_C_COMPILER_ID MATCHES "^(GNU|LLVM)$")
SET_SOURCE_FILES_PROPERTIES(testProcess.c PROPERTIES COMPILE_FLAGS -O0)
ELSEIF(CMAKE_C_COMPILER_ID STREQUAL "XL")
# Tell IBM XL not to warn about our test infinite loop
diff --git a/Directory.hxx.in b/Directory.hxx.in
index 0acb191..1bcf90e 100644
--- a/Directory.hxx.in
+++ b/Directory.hxx.in
@@ -18,7 +18,6 @@
/* Define these macros temporarily to keep the code readable. */
#if !defined (KWSYS_NAMESPACE) && !@KWSYS_NAMESPACE@_NAME_IS_KWSYS
# define kwsys_stl @KWSYS_NAMESPACE@_stl
-# define kwsys_ios @KWSYS_NAMESPACE@_ios
#endif
namespace @KWSYS_NAMESPACE@
@@ -87,7 +86,6 @@ private:
/* Undefine temporary macros. */
#if !defined (KWSYS_NAMESPACE) && !@KWSYS_NAMESPACE@_NAME_IS_KWSYS
# undef kwsys_stl
-# undef kwsys_ios
#endif
#endif
diff --git a/DynamicLoader.cxx b/DynamicLoad
[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-270-g8d71f4b
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 8d71f4b52946e409c18f2a6a05a66baa5160a3a2 (commit)
via eaf6f67f67e12c4e137c8e875ac277072bf910b6 (commit)
via 45a25d63ba738e8b0ce690f8f02469a82815b5f4 (commit)
from 3b27655763a7a0bf37e0683e93f5ffca279eaceb (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8d71f4b52946e409c18f2a6a05a66baa5160a3a2
commit 8d71f4b52946e409c18f2a6a05a66baa5160a3a2
Merge: 3b27655 eaf6f67
Author: Brad King
AuthorDate: Mon Nov 3 09:20:43 2014 -0500
Commit: CMake Topic Stage
CommitDate: Mon Nov 3 09:20:43 2014 -0500
Merge topic 'extra-generators-std-flags' into next
eaf6f67f Code Blocks/Eclipse: Add -std= flag matching.
45a25d63 Code Blocks/Eclipse: Use non-default stdlib includes when
specified.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eaf6f67f67e12c4e137c8e875ac277072bf910b6
commit eaf6f67f67e12c4e137c8e875ac277072bf910b6
Author: Christian Manning
AuthorDate: Wed Jul 2 21:06:42 2014 +0100
Commit: Brad King
CommitDate: Mon Nov 3 09:19:18 2014 -0500
Code Blocks/Eclipse: Add -std= flag matching.
When -std=x is specified in CMAKE_CXX_FLAGS this passes it along.
diff --git
a/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake
b/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake
index 0eacbba..064e650 100644
--- a/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake
+++ b/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake
@@ -30,11 +30,14 @@ macro(_DETERMINE_GCC_SYSTEM_INCLUDE_DIRS _lang
_resultIncludeDirs _resultDefines
if (CMAKE_CXX_FLAGS MATCHES "(-stdlib=[^ ]+)")
set(_stdlib "${CMAKE_MATCH_1}")
endif ()
+if (CMAKE_CXX_FLAGS MATCHES "(-std=[^ ]+)")
+ set(_stdver "${CMAKE_MATCH_1}")
+endif ()
else ()
set(_compilerExecutable "${CMAKE_C_COMPILER}")
set(_arg1 "${CMAKE_C_COMPILER_ARG1}")
endif ()
- execute_process(COMMAND ${_compilerExecutable} ${_arg1} ${_stdlib} -v -E -x
${_lang} -dD dummy
+ execute_process(COMMAND ${_compilerExecutable} ${_arg1} ${_stdver}
${_stdlib} -v -E -x ${_lang} -dD dummy
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/CMakeFiles
ERROR_VARIABLE _gccOutput
OUTPUT_VARIABLE _gccStdout )
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=45a25d63ba738e8b0ce690f8f02469a82815b5f4
commit 45a25d63ba738e8b0ce690f8f02469a82815b5f4
Author: Christian Manning
AuthorDate: Wed Jul 2 16:15:28 2014 +0100
Commit: Brad King
CommitDate: Mon Nov 3 09:18:44 2014 -0500
Code Blocks/Eclipse: Use non-default stdlib includes when specified.
When -stdlib=x is specified in CMAKE_CXX_FLAGS this passes it along so
that the correct include dirs are detected.
diff --git
a/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake
b/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake
index 92b0d1d..0eacbba 100644
--- a/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake
+++ b/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake
@@ -26,11 +26,15 @@ macro(_DETERMINE_GCC_SYSTEM_INCLUDE_DIRS _lang
_resultIncludeDirs _resultDefines
if (${_lang} STREQUAL "c++")
set(_compilerExecutable "${CMAKE_CXX_COMPILER}")
set(_arg1 "${CMAKE_CXX_COMPILER_ARG1}")
+
+if (CMAKE_CXX_FLAGS MATCHES "(-stdlib=[^ ]+)")
+ set(_stdlib "${CMAKE_MATCH_1}")
+endif ()
else ()
set(_compilerExecutable "${CMAKE_C_COMPILER}")
set(_arg1 "${CMAKE_C_COMPILER_ARG1}")
endif ()
- execute_process(COMMAND ${_compilerExecutable} ${_arg1} -v -E -x ${_lang}
-dD dummy
+ execute_process(COMMAND ${_compilerExecutable} ${_arg1} ${_stdlib} -v -E -x
${_lang} -dD dummy
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/CMakeFiles
ERROR_VARIABLE _gccOutput
OUTPUT_VARIABLE _gccStdout )
---
Summary of changes:
...eExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake |9 -
1 file changed, 8 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-267-g3b27655
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake". The branch, next has been updated via 3b27655763a7a0bf37e0683e93f5ffca279eaceb (commit) via 6aa2d4773701d5b491c44e2c0eda202b46b36521 (commit) via 44853be608a18c94a1ce4000446ec7f29b8f0ee3 (commit) via 5755d0059a386324c89e03f279d875496b26ea04 (commit) via b25a200204c1d72df6f97b6362a54f0914c3b0a7 (commit) from 52af5c52f8fc53f53c082b8976bba74dc9bba068 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3b27655763a7a0bf37e0683e93f5ffca279eaceb commit 3b27655763a7a0bf37e0683e93f5ffca279eaceb Merge: 52af5c5 6aa2d47 Author: Brad King AuthorDate: Mon Nov 3 09:08:44 2014 -0500 Commit: Brad King CommitDate: Mon Nov 3 09:08:44 2014 -0500 Merge branch 'master' into next --- Summary of changes: Source/CMakeVersion.cmake |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.1.0-rc1-115-g6aa2d47
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake". The branch, master has been updated via 6aa2d4773701d5b491c44e2c0eda202b46b36521 (commit) via 1531df2b866df9aa52dc54219a4552e94f47b622 (commit) via 4abbb1400d81e1288cdf1e2f708eaa938f7b3955 (commit) via bd7ba8e25f0bc2d57bc162d2d945e10bad29a327 (commit) via e9282782e489a78de9c2896ee01fdd02ce8ca396 (commit) from 44853be608a18c94a1ce4000446ec7f29b8f0ee3 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6aa2d4773701d5b491c44e2c0eda202b46b36521 commit 6aa2d4773701d5b491c44e2c0eda202b46b36521 Merge: 44853be 1531df2 Author: Brad King AuthorDate: Mon Nov 3 09:08:35 2014 -0500 Commit: CMake Topic Stage CommitDate: Mon Nov 3 09:08:35 2014 -0500 Merge topic 'fix-configure_file-COPYONLY' 1531df2b configure_file: Warn about unknown arguments 4abbb140 Qt4: Fix configure_file call to use COPYONLY, not COPY_ONLY bd7ba8e2 KWSys: Fix configure_file call to use COPYONLY, not COPY_ONLY e9282782 Help: Fix configure_file call to use COPYONLY, not COPY_ONLY --- Summary of changes: Help/manual/cmake-packages.7.rst|2 +- Modules/Qt4Macros.cmake |2 +- Source/cmConfigureFileCommand.cxx | 13 + Source/kwsys/CMakeLists.txt |2 +- Tests/RunCMake/configure_file/RunCMakeTest.cmake|1 + Tests/RunCMake/configure_file/UnknownArg-stderr.txt | 10 ++ Tests/RunCMake/configure_file/UnknownArg.cmake |2 ++ 7 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 Tests/RunCMake/configure_file/UnknownArg-stderr.txt create mode 100644 Tests/RunCMake/configure_file/UnknownArg.cmake hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-262-g52af5c5
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 52af5c52f8fc53f53c082b8976bba74dc9bba068 (commit)
via 6b63942e45ebc8f542ef68359268e215da10c611 (commit)
from 13cbd0344b9f4a3ecf9e19c42f9125093ca9cc95 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=52af5c52f8fc53f53c082b8976bba74dc9bba068
commit 52af5c52f8fc53f53c082b8976bba74dc9bba068
Merge: 13cbd03 6b63942
Author: Brad King
AuthorDate: Mon Nov 3 08:49:25 2014 -0500
Commit: CMake Topic Stage
CommitDate: Mon Nov 3 08:49:25 2014 -0500
Merge topic 'watcom-drop-symfile-option' into next
6b63942e Watcom: Drop symfile linker option
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6b63942e45ebc8f542ef68359268e215da10c611
commit 6b63942e45ebc8f542ef68359268e215da10c611
Author: J Decker
AuthorDate: Sun Nov 2 13:59:27 2014 -0800
Commit: Brad King
CommitDate: Mon Nov 3 08:46:48 2014 -0500
Watcom: Drop symfile linker option
Cleanup of Windows-wcl386.cmake in commit v3.1.0-rc1~693^2 (Watcom:
Cleanup Windows-wcl386 configuration, 2014-04-01) also introduced use of
the 'symfile' link option but did not mention it in the commit message.
There is no way to set the symbol file name of a target, so it is better
to revert that change. It is easy to run 'wstrip *' if the symbols need
to be stripped, but it is very difficult to get the right names for the
.sym files to install with debug/rel_with_deb_info configurations.
diff --git a/Modules/Platform/Windows-wcl386.cmake
b/Modules/Platform/Windows-wcl386.cmake
index ac410de..88f9bf7 100644
--- a/Modules/Platform/Windows-wcl386.cmake
+++ b/Modules/Platform/Windows-wcl386.cmake
@@ -18,8 +18,8 @@ set(CMAKE_CREATE_CONSOLE_EXE "system nt" )
set(CMAKE_SHARED_LINKER_FLAGS_INIT "system nt_dll")
set(CMAKE_MODULE_LINKER_FLAGS_INIT "system nt_dll")
foreach(type SHARED MODULE EXE)
- set(CMAKE_${type}_LINKER_FLAGS_DEBUG_INIT "debug all opt map, symfile")
- set(CMAKE_${type}_LINKER_FLAGS_RELWITHDEBINFO_INIT "debug all opt map,
symfile")
+ set(CMAKE_${type}_LINKER_FLAGS_DEBUG_INIT "debug all opt map")
+ set(CMAKE_${type}_LINKER_FLAGS_RELWITHDEBINFO_INIT "debug all opt map")
endforeach()
set(CMAKE_C_COMPILE_OPTIONS_DLL "-bd") # Note: This variable is a ';'
separated list
---
Summary of changes:
Modules/Platform/Windows-wcl386.cmake |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
