[Cmake-commits] CMake branch, next, updated. v2.8.12-4049-g6d9e164
Brad King
brad.king at kitware.com
Wed Oct 16 09:54:35 EDT 2013
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 6d9e164be26c4ceb2667accbd6b83a8bafd00938 (commit)
via 28daf5044b459c7e33c4e14c2c9ec0d2fb0bd9cb (commit)
via 0a4c6a4d291b5604a2ec16bfc55b8c848716656f (commit)
from 2ed223ff5d02f0c3266ea622cfd03c57731312f5 (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=6d9e164be26c4ceb2667accbd6b83a8bafd00938
commit 6d9e164be26c4ceb2667accbd6b83a8bafd00938
Merge: 2ed223f 28daf50
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 16 09:54:33 2013 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 16 09:54:33 2013 -0400
Merge topic 'INTERFACE_LIBRARY-build-targets' into next
28daf50 Makefile: Always create clean target command
0a4c6a4 Tests/InterfaceBuildTargets: Fix testlib file name
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=28daf5044b459c7e33c4e14c2c9ec0d2fb0bd9cb
commit 28daf5044b459c7e33c4e14c2c9ec0d2fb0bd9cb
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 16 09:52:37 2013 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 16 09:52:42 2013 -0400
Makefile: Always create clean target command
Borland Make complains if the phony clean target has no rule to build it.
If there are no files to clean, generate and run an empty clean script.
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 4725459..508eca1 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -1159,27 +1159,25 @@ cmLocalUnixMakefileGenerator3
const std::vector<std::string>& files,
cmTarget& target, const char* filename)
{
+ std::string cleanfile = this->Makefile->GetCurrentOutputDirectory();
+ cleanfile += "/";
+ cleanfile += this->GetTargetDirectory(target);
+ cleanfile += "/cmake_clean";
+ if(filename)
+ {
+ cleanfile += "_";
+ cleanfile += filename;
+ }
+ cleanfile += ".cmake";
+ std::string cleanfilePath = this->Convert(cleanfile.c_str(), FULL);
+ std::ofstream fout(cleanfilePath.c_str());
+ if(!fout)
+ {
+ cmSystemTools::Error("Could not create ", cleanfilePath.c_str());
+ }
if(!files.empty())
{
- std::string cleanfile = this->Makefile->GetCurrentOutputDirectory();
- cleanfile += "/";
- cleanfile += this->GetTargetDirectory(target);
- cleanfile += "/cmake_clean";
- if(filename)
- {
- cleanfile += "_";
- cleanfile += filename;
- }
- cleanfile += ".cmake";
- std::string cleanfilePath = this->Convert(cleanfile.c_str(), FULL);
- std::ofstream fout(cleanfilePath.c_str());
- if(!fout)
- {
- cmSystemTools::Error("Could not create ", cleanfilePath.c_str());
- }
fout << "file(REMOVE_RECURSE\n";
- std::string remove = "$(CMAKE_COMMAND) -P ";
- remove += this->Convert(cleanfile.c_str(), START_OUTPUT, SHELL);
for(std::vector<std::string>::const_iterator f = files.begin();
f != files.end(); ++f)
{
@@ -1187,27 +1185,29 @@ cmLocalUnixMakefileGenerator3
fout << " " << this->EscapeForCMake(fc.c_str()) << "\n";
}
fout << ")\n";
- commands.push_back(remove);
-
- // For the main clean rule add per-language cleaning.
- if(!filename)
+ }
+ std::string remove = "$(CMAKE_COMMAND) -P ";
+ remove += this->Convert(cleanfile.c_str(), START_OUTPUT, SHELL);
+ commands.push_back(remove);
+
+ // For the main clean rule add per-language cleaning.
+ if(!filename)
+ {
+ // Get the set of source languages in the target.
+ std::set<cmStdString> languages;
+ target.GetLanguages(languages);
+ fout << "\n"
+ << "# Per-language clean rules from dependency scanning.\n"
+ << "foreach(lang";
+ for(std::set<cmStdString>::const_iterator l = languages.begin();
+ l != languages.end(); ++l)
{
- // Get the set of source languages in the target.
- std::set<cmStdString> languages;
- target.GetLanguages(languages);
- fout << "\n"
- << "# Per-language clean rules from dependency scanning.\n"
- << "foreach(lang";
- for(std::set<cmStdString>::const_iterator l = languages.begin();
- l != languages.end(); ++l)
- {
- fout << " " << *l;
- }
- fout << ")\n"
- << " include(" << this->GetTargetDirectory(target)
- << "/cmake_clean_${lang}.cmake OPTIONAL)\n"
- << "endforeach()\n";
+ fout << " " << *l;
}
+ fout << ")\n"
+ << " include(" << this->GetTargetDirectory(target)
+ << "/cmake_clean_${lang}.cmake OPTIONAL)\n"
+ << "endforeach()\n";
}
}
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0a4c6a4d291b5604a2ec16bfc55b8c848716656f
commit 0a4c6a4d291b5604a2ec16bfc55b8c848716656f
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 16 09:51:54 2013 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 16 09:51:59 2013 -0400
Tests/InterfaceBuildTargets: Fix testlib file name
On Borland and Watcom we expect the .lib extension, so add it.
diff --git a/Tests/InterfaceBuildTargets/CMakeLists.txt b/Tests/InterfaceBuildTargets/CMakeLists.txt
index ad92578..630259d 100644
--- a/Tests/InterfaceBuildTargets/CMakeLists.txt
+++ b/Tests/InterfaceBuildTargets/CMakeLists.txt
@@ -2,7 +2,12 @@ project(InterfaceBuildTargets)
add_library(testlib testlib.cxx)
set_property(TARGET testlib PROPERTY PREFIX "")
-set_property(TARGET testlib PROPERTY SUFFIX "")
+if(CMAKE_GENERATOR MATCHES "Borland|Watcom")
+ # These librarians add the .lib suffix anyway.
+ set_property(TARGET testlib PROPERTY SUFFIX ".lib")
+else()
+ set_property(TARGET testlib PROPERTY SUFFIX "")
+endif()
add_library(iface INTERFACE)
target_link_libraries(iface INTERFACE testlib)
-----------------------------------------------------------------------
Summary of changes:
Source/cmLocalUnixMakefileGenerator3.cxx | 72 ++++++++++++++--------------
Tests/InterfaceBuildTargets/CMakeLists.txt | 7 ++-
2 files changed, 42 insertions(+), 37 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list