[Cmake-commits] CMake branch, next, updated. v2.8.7-3053-g234216a
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 234216ad5221518f03b830d351eb6e3733964487 (commit)
via 89403bf87f21d9bccb9c73afb5df914cb88ec9ee (commit)
from d8adfc2f12b866396f56b2fae89987dafe370734 (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=234216ad5221518f03b830d351eb6e3733964487
commit 234216ad5221518f03b830d351eb6e3733964487
Merge: d8adfc2 89403bf
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Mar 5 08:36:07 2012 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Mar 5 08:36:07 2012 -0500
Merge topic 'rename-used-commands' into next
89403bf Rename UsedCommands to FinalPassCommands
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=89403bf87f21d9bccb9c73afb5df914cb88ec9ee
commit 89403bf87f21d9bccb9c73afb5df914cb88ec9ee
Author: Yury G. Kudryashov urkud.ur...@gmail.com
AuthorDate: Wed Feb 29 11:49:42 2012 +0400
Commit: Yury G. Kudryashov urkud.ur...@gmail.com
CommitDate: Wed Feb 29 11:49:42 2012 +0400
Rename UsedCommands to FinalPassCommands
When I read 'UsedCommands' I thought that it holds all commands used in the
file, not only those that have FinalPass().
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index fdf5b31..a715f06 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -210,9 +210,9 @@ cmMakefile::~cmMakefile()
{
delete *i;
}
- for(unsigned int i=0; i this-UsedCommands.size(); i++)
+ for(unsigned int i=0; i this-FinalPassCommands.size(); i++)
{
-delete this-UsedCommands[i];
+delete this-FinalPassCommands[i];
}
std::vectorcmFunctionBlocker*::iterator pos;
for (pos = this-FunctionBlockers.begin();
@@ -421,7 +421,7 @@ bool cmMakefile::ExecuteCommand(const cmListFileFunction
lff,
else if(pcmd-HasFinalPass())
{
// use the command
-this-UsedCommands.push_back(pcmd.release());
+this-FinalPassCommands.push_back(pcmd.release());
}
}
else if ( this-GetCMakeInstance()-GetWorkingMode() == cmake::SCRIPT_MODE
@@ -813,8 +813,8 @@ void cmMakefile::FinalPass()
// give all the commands a chance to do something
// after the file has been parsed before generation
- for(std::vectorcmCommand*::iterator i = this-UsedCommands.begin();
- i != this-UsedCommands.end(); ++i)
+ for(std::vectorcmCommand*::iterator i = this-FinalPassCommands.begin();
+ i != this-FinalPassCommands.end(); ++i)
{
(*i)-FinalPass();
}
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 1c46a73..f1f318a 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -620,12 +620,6 @@ public:
*/
bool CanIWriteThisFile(const char* fileName);
- /**
- * Get the vector of used command instances.
- */
- const std::vectorcmCommand* GetUsedCommands() const
-{return this-UsedCommands;}
-
#if defined(CMAKE_BUILD_WITH_CMAKE)
/**
* Get the vector source groups.
@@ -913,7 +907,7 @@ protected:
std::vectorcmSourceGroup SourceGroups;
#endif
- std::vectorcmCommand* UsedCommands;
+ std::vectorcmCommand* FinalPassCommands;
cmLocalGenerator* LocalGenerator;
bool IsFunctionBlocked(const cmListFileFunction lff,
cmExecutionStatus status);
---
Summary of changes:
Source/cmMakefile.cxx | 10 +-
Source/cmMakefile.h |8 +---
2 files changed, 6 insertions(+), 12 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.7-3056-g1ff8087
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 1ff8087e897324513bf370b3ce96d67432245dab (commit)
via aef248a4ff675aeb4af6aa44322bed76f4bcf990 (commit)
via e26657103fa95b2a898e438ec6eb982a3c0bf3cc (commit)
from 234216ad5221518f03b830d351eb6e3733964487 (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=1ff8087e897324513bf370b3ce96d67432245dab
commit 1ff8087e897324513bf370b3ce96d67432245dab
Merge: 234216a aef248a
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Mar 5 08:37:54 2012 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Mar 5 08:37:54 2012 -0500
Merge topic 'remove-unused-members' into next
aef248a Remove cmExprParserHelper::SetLineFile()
e266571 Remove UnionsAvailable member from 2 classes
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aef248a4ff675aeb4af6aa44322bed76f4bcf990
commit aef248a4ff675aeb4af6aa44322bed76f4bcf990
Author: Yury G. Kudryashov urkud.ur...@gmail.com
AuthorDate: Wed Feb 29 21:56:13 2012 +0400
Commit: Yury G. Kudryashov urkud.ur...@gmail.com
CommitDate: Sat Mar 3 15:11:09 2012 +0400
Remove cmExprParserHelper::SetLineFile()
diff --git a/Source/cmExprParserHelper.cxx b/Source/cmExprParserHelper.cxx
index ee37352..7728d74 100644
--- a/Source/cmExprParserHelper.cxx
+++ b/Source/cmExprParserHelper.cxx
@@ -30,12 +30,6 @@ cmExprParserHelper::~cmExprParserHelper()
this-CleanupParser();
}
-void cmExprParserHelper::SetLineFile(long line, const char* file)
-{
- this-FileLine = line;
- this-FileName = file;
-}
-
int cmExprParserHelper::ParseString(const char* str, int verb)
{
if ( !str)
diff --git a/Source/cmExprParserHelper.h b/Source/cmExprParserHelper.h
index f3fd4f6..690426d 100644
--- a/Source/cmExprParserHelper.h
+++ b/Source/cmExprParserHelper.h
@@ -46,8 +46,6 @@ public:
int GetResult() { return this-Result; }
- void SetLineFile(long line, const char* file);
-
const char* GetError() { return this-ErrorString.c_str(); }
private:
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e26657103fa95b2a898e438ec6eb982a3c0bf3cc
commit e26657103fa95b2a898e438ec6eb982a3c0bf3cc
Author: Yury G. Kudryashov urkud.ur...@gmail.com
AuthorDate: Wed Feb 29 17:44:02 2012 +0400
Commit: Yury G. Kudryashov urkud.ur...@gmail.com
CommitDate: Sat Mar 3 15:11:08 2012 +0400
Remove UnionsAvailable member from 2 classes
These classes were copied from cmDependsJavaParserHelper that really needs
this
member.
diff --git a/Source/cmCommandArgumentParserHelper.h
b/Source/cmCommandArgumentParserHelper.h
index a211e95..cdb832b 100644
--- a/Source/cmCommandArgumentParserHelper.h
+++ b/Source/cmCommandArgumentParserHelper.h
@@ -81,7 +81,6 @@ private:
cmStdString InputBuffer;
std::vectorchar OutputBuffer;
int CurrentLine;
- int UnionsAvailable;
int Verbose;
void Print(const char* place, const char* str);
diff --git a/Source/cmExprParserHelper.h b/Source/cmExprParserHelper.h
index 0c36b44..f3fd4f6 100644
--- a/Source/cmExprParserHelper.h
+++ b/Source/cmExprParserHelper.h
@@ -55,7 +55,6 @@ private:
cmStdString InputBuffer;
std::vectorchar OutputBuffer;
int CurrentLine;
- int UnionsAvailable;
int Verbose;
void Print(const char* place, const char* str);
---
Summary of changes:
Source/cmCommandArgumentParserHelper.h |1 -
Source/cmExprParserHelper.cxx |6 --
Source/cmExprParserHelper.h|3 ---
3 files changed, 0 insertions(+), 10 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.7-3058-g027084f
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 027084f60efced153ac088acf69ab0e1ff68aba5 (commit) via 761c146a4c02c76adafb233606dfe50157857c87 (commit) from 1ff8087e897324513bf370b3ce96d67432245dab (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=027084f60efced153ac088acf69ab0e1ff68aba5 commit 027084f60efced153ac088acf69ab0e1ff68aba5 Merge: 1ff8087 761c146 Author: Stephen Kelly steve...@gmail.com AuthorDate: Mon Mar 5 09:51:50 2012 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Mon Mar 5 09:51:50 2012 -0500 Merge topic 'win32_executable-and-macosx_bundle-initializers' into next 761c146 Add default initializers for WIN32_EXECUTABLE and MACOSX_BUNDLE http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=761c146a4c02c76adafb233606dfe50157857c87 commit 761c146a4c02c76adafb233606dfe50157857c87 Author: Stephen Kelly steve...@gmail.com AuthorDate: Mon Mar 5 15:36:46 2012 +0100 Commit: Stephen Kelly steve...@gmail.com CommitDate: Mon Mar 5 15:50:55 2012 +0100 Add default initializers for WIN32_EXECUTABLE and MACOSX_BUNDLE This allows downstreams to use set(CMAKE_WIN32_EXECUTABLE ON) set(CMAKE_MACOSX_BUNDLE ON) to create executables with the WIN32_EXECUTABLE and MACOSX_BUNDLE properties set on by default. diff --git a/Source/cmDocumentVariables.cxx b/Source/cmDocumentVariables.cxx index a31dd01..80f6b87 100644 --- a/Source/cmDocumentVariables.cxx +++ b/Source/cmDocumentVariables.cxx @@ -1278,6 +1278,22 @@ void cmDocumentVariables::DefineVariables(cmake* cm) See that target property for additional information., false, Variables that Control the Build); + cm-DefineProperty +(CMAKE_WIN32_EXECUTABLE, cmProperty::VARIABLE, + Default value for WIN32_EXECUTABLE of targets., + This variable is used to initialize the + WIN32_EXECUTABLE property on all the targets. + See that target property for additional information., + false, + Variables that Control the Build); + cm-DefineProperty +(CMAKE_MACOSX_BUNDLE, cmProperty::VARIABLE, + Default value for MACOSX_BUNDLE of targets., + This variable is used to initialize the + MACOSX_BUNDLE property on all the targets. + See that target property for additional information., + false, + Variables that Control the Build); // Variables defined when the a language is enabled These variables will // also be defined whenever CMake has loaded its support for compiling (LANG) diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index da99eb9..817375e 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -861,7 +861,9 @@ void cmTarget::DefineProperties(cmake *cm) of of just main(). This makes it a GUI executable instead of a console application. See the CMAKE_MFC_FLAG variable documentation to configure use - of MFC for WinMain executables.); + of MFC for WinMain executables. + This property is initialized by the value of the variable + CMAKE_WIN32_EXECUTABLE if it is set when a target is created.); cm-DefineProperty (MACOSX_BUNDLE, cmProperty::TARGET, @@ -871,7 +873,9 @@ void cmTarget::DefineProperties(cmake *cm) This makes it a GUI executable that can be launched from the Finder. See the MACOSX_BUNDLE_INFO_PLIST target property for information - about creation of the Info.plist file for the application bundle.); + about creation of the Info.plist file for the application bundle. + This property is initialized by the value of the variable + CMAKE_MACOSX_BUNDLE if it is set when a target is created.); cm-DefineProperty (MACOSX_BUNDLE_INFO_PLIST, cmProperty::TARGET, @@ -1224,6 +1228,8 @@ void cmTarget::SetMakefile(cmMakefile* mf) this-SetPropertyDefault(AUTOMOC, 0); this-SetPropertyDefault(AUTOMOC_MOC_OPTIONS, 0); this-SetPropertyDefault(LINK_INTERFACE_LIBRARIES, 0); + this-SetPropertyDefault(WIN32_EXECUTABLE, 0); + this-SetPropertyDefault(MACOSX_BUNDLE, 0); // Collect the set of configuration types. std::vectorstd::string configNames; --- Summary of changes: Source/cmDocumentVariables.cxx | 16 Source/cmTarget.cxx| 10 -- 2 files changed, 24 insertions(+), 2 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.7-3060-g7f1b86d
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 7f1b86d666b0d18dae8ea3196e821e57bffdaef7 (commit) via 635bf50c27aef184bfa1698953dd44361e1fb2f9 (commit) from 027084f60efced153ac088acf69ab0e1ff68aba5 (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=7f1b86d666b0d18dae8ea3196e821e57bffdaef7 commit 7f1b86d666b0d18dae8ea3196e821e57bffdaef7 Merge: 027084f 635bf50 Author: Stephen Kelly steve...@gmail.com AuthorDate: Mon Mar 5 16:49:21 2012 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Mon Mar 5 16:49:21 2012 -0500 Merge topic 'skip-install-rpath' into next 635bf50 Add an option to skip RPATH during installation. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=635bf50c27aef184bfa1698953dd44361e1fb2f9 commit 635bf50c27aef184bfa1698953dd44361e1fb2f9 Author: Stephen Kelly steve...@gmail.com AuthorDate: Mon Feb 20 00:34:11 2012 +0100 Commit: Stephen Kelly steve...@gmail.com CommitDate: Mon Mar 5 22:24:57 2012 +0100 Add an option to skip RPATH during installation. diff --git a/Modules/CMakeGenericSystem.cmake b/Modules/CMakeGenericSystem.cmake index 6cd8fe6..ee8040e 100644 --- a/Modules/CMakeGenericSystem.cmake +++ b/Modules/CMakeGenericSystem.cmake @@ -39,6 +39,8 @@ SET_PROPERTY(GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS TRUE) SET (CMAKE_SKIP_RPATH NO CACHE BOOL If set, runtime paths are not added when using shared libraries.) +SET (CMAKE_SKIP_INSTALL_RPATH NO CACHE BOOL + If set, runtime paths are not added when installing shared libraries, but are added when building.) SET(CMAKE_VERBOSE_MAKEFILE FALSE CACHE BOOL If this value is on, makefiles will be generated without the .SILENT directive, and all commands will be echoed to the console during the make. This is useful for debugging only. With Visual Studio IDE projects all commands are done without /nologo.) @@ -168,5 +170,6 @@ ENDIF(CMAKE_HOST_UNIX) MARK_AS_ADVANCED( CMAKE_SKIP_RPATH + CMAKE_SKIP_INSTALL_RPATH CMAKE_VERBOSE_MAKEFILE ) diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx index edf6c35..c57b85d 100644 --- a/Source/cmComputeLinkInformation.cxx +++ b/Source/cmComputeLinkInformation.cxx @@ -1760,6 +1760,7 @@ void cmComputeLinkInformation::GetRPath(std::vectorstd::string runtimeDirs, !linking_for_install); bool use_link_rpath = outputRuntime linking_for_install +!this-Makefile-IsOn(CMAKE_SKIP_INSTALL_RPATH) this-Target-GetPropertyAsBool(INSTALL_RPATH_USE_LINK_PATH); // Construct the RPATH. diff --git a/Source/cmDocumentVariables.cxx b/Source/cmDocumentVariables.cxx index 1cab2b5..fb15615 100644 --- a/Source/cmDocumentVariables.cxx +++ b/Source/cmDocumentVariables.cxx @@ -355,7 +355,9 @@ void cmDocumentVariables::DefineVariables(cmake* cm) If this is set to TRUE, then the rpath information is not added to compiled executables. The default is to add rpath information if the platform supports it. - This allows for easy running from the build tree.,false, + This allows for easy running from the build tree. To omit RPATH + in the install step, but not the build step, use + CMAKE_SKIP_INSTALL_RPATH instead.,false, Variables that Provide Information); cm-DefineProperty (CMAKE_SOURCE_DIR, cmProperty::VARIABLE, @@ -1181,6 +1183,20 @@ void cmDocumentVariables::DefineVariables(cmake* cm) Variables that Control the Build); cm-DefineProperty +(CMAKE_SKIP_INSTALL_RPATH, cmProperty::VARIABLE, + Do not include RPATHs in the install tree., + Normally CMake uses the build tree for the RPATH when building + executables etc on systems that use RPATH. When the software + is installed the executables etc are relinked by CMake to have + the install RPATH. If this variable is set to true then the software + is always installed without RPATH, even if RPATH is enabled when + building. This can be useful for example to allow running tests from + the build directory with RPATH enabled before the installation step. + To omit RPATH in both the build and install steps, use + CMAKE_SKIP_RPATH instead.,false, + Variables that Control the Build); + + cm-DefineProperty (CMAKE_EXE_LINKER_FLAGS, cmProperty::VARIABLE, Linker flags used to create executables., Flags used by the linker when creating an executable.,false, diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index ae5596b..b87c086 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -3602,7 +3602,8 @@ bool
[Cmake-commits] CMake branch, master, updated. v2.8.7-561-gec50093
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 ec50093be768c9fa9384cc42a4d1f331f0264b39 (commit) from 17a099dd1379051eaa6c0a66a5ee6df5aea49089 (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=ec50093be768c9fa9384cc42a4d1f331f0264b39 commit ec50093be768c9fa9384cc42a4d1f331f0264b39 Author: KWSys Robot kwro...@kitware.com AuthorDate: Tue Mar 6 00:01:07 2012 -0500 Commit: KWSys Robot kwro...@kitware.com CommitDate: Tue Mar 6 00:05:18 2012 -0500 KWSys Nightly Date Stamp diff --git a/Source/kwsys/kwsysDateStamp.cmake b/Source/kwsys/kwsysDateStamp.cmake index d4dcea9..617f126 100644 --- a/Source/kwsys/kwsysDateStamp.cmake +++ b/Source/kwsys/kwsysDateStamp.cmake @@ -18,4 +18,4 @@ SET(KWSYS_DATE_STAMP_YEAR 2012) SET(KWSYS_DATE_STAMP_MONTH 03) # KWSys version date day component. Format is DD. -SET(KWSYS_DATE_STAMP_DAY 05) +SET(KWSYS_DATE_STAMP_DAY 06) --- Summary of changes: Source/kwsys/kwsysDateStamp.cmake |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
