[Cmake-commits] CMake branch, next, updated. v2.8.8-3395-g55bd8c7
David Cole
david.cole at kitware.com
Mon Jul 9 14:17:44 EDT 2012
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 55bd8c766418b54a50fbb7a85d7f4cec9b25dd5b (commit)
via 6b31d395513fe8ea7b17489b7235c16c1ebad7e1 (commit)
via 9b311fbee66d98b5396f6327305d5163ab78285c (commit)
via e3b1be24a808fdb3dc0482a33fe423c0eb945a7b (commit)
via 990f77eab35675f323fb320a75e843eb7bddee21 (commit)
from 7394e7bc5d3ce4cf04f28258505275c9cb2960e1 (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=55bd8c766418b54a50fbb7a85d7f4cec9b25dd5b
commit 55bd8c766418b54a50fbb7a85d7f4cec9b25dd5b
Merge: 7394e7b 6b31d39
Author: David Cole <david.cole at kitware.com>
AuthorDate: Mon Jul 9 14:17:42 2012 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jul 9 14:17:42 2012 -0400
Merge topic 'ninja-fixes' into next
6b31d39 Ninja: don't shadow 'outputs' variable
9b311fb Ninja: add soname test case
e3b1be2 Ninja: Clean all symlink created for libraries.
990f77e Ninja: remove int/size_t warning
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6b31d395513fe8ea7b17489b7235c16c1ebad7e1
commit 6b31d395513fe8ea7b17489b7235c16c1ebad7e1
Author: Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Fri Jul 6 10:16:45 2012 +0200
Commit: David Cole <david.cole at kitware.com>
CommitDate: Mon Jul 9 14:15:08 2012 -0400
Ninja: don't shadow 'outputs' variable
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 4787cb3..0cf90aa 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -508,20 +508,20 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
emptyDeps,
symlinkVars);
} else {
- cmNinjaDeps outputs;
+ cmNinjaDeps symlinks;
const std::string soName = this->GetTargetFilePath(this->TargetNameSO);
// If one link has to be created.
if (targetOutputReal == soName || targetOutput == soName) {
symlinkVars["SONAME"] = soName;
} else {
symlinkVars["SONAME"] = "";
- outputs.push_back(soName);
+ symlinks.push_back(soName);
}
- outputs.push_back(targetOutput);
+ symlinks.push_back(targetOutput);
cmGlobalNinjaGenerator::WriteBuild(this->GetBuildFileStream(),
"Create library symlink " + targetOutput,
"CMAKE_SYMLINK_LIBRARY",
- outputs,
+ symlinks,
cmNinjaDeps(1, targetOutputReal),
emptyDeps,
emptyDeps,
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9b311fbee66d98b5396f6327305d5163ab78285c
commit 9b311fbee66d98b5396f6327305d5163ab78285c
Author: Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Tue Jul 3 15:01:06 2012 +0200
Commit: David Cole <david.cole at kitware.com>
CommitDate: Mon Jul 9 14:15:08 2012 -0400
Ninja: add soname test case
diff --git a/Tests/LibName/CMakeLists.txt b/Tests/LibName/CMakeLists.txt
index 3dca0b0..07499a1 100644
--- a/Tests/LibName/CMakeLists.txt
+++ b/Tests/LibName/CMakeLists.txt
@@ -3,11 +3,24 @@ project(LibName)
# LIBRARY_OUTPUT_PATH and EXECUTABLE_OUTPUT_PATH work
set(LIBRARY_OUTPUT_PATH lib)
set(EXECUTABLE_OUTPUT_PATH lib)
+
add_library(bar SHARED bar.c)
+
add_library(foo SHARED foo.c)
target_link_libraries(foo bar)
+
add_executable(foobar foobar.c)
target_link_libraries(foobar foo)
IF(UNIX)
target_link_libraries(foobar -L/usr/local/lib)
ENDIF(UNIX)
+
+
+# check with lib version
+
+add_library(verFoo SHARED foo.c)
+target_link_libraries(verFoo bar)
+set_target_properties(verFoo PROPERTIES VERSION 3.1.4 SOVERSION 3)
+
+add_executable(verFoobar foobar.c)
+target_link_libraries(verFoobar verFoo)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e3b1be24a808fdb3dc0482a33fe423c0eb945a7b
commit e3b1be24a808fdb3dc0482a33fe423c0eb945a7b
Author: Nicolas Despres <nicolas.despres at gmail.com>
AuthorDate: Mon Apr 2 12:35:55 2012 +0200
Commit: David Cole <david.cole at kitware.com>
CommitDate: Mon Jul 9 14:15:08 2012 -0400
Ninja: Clean all symlink created for libraries.
'ninja -t clean' only cleans built output and dep files so all file
created as a side effect and not mentioned in the 'build' statement
would be omitted.
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 6befb05..4787cb3 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -508,11 +508,20 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
emptyDeps,
symlinkVars);
} else {
- symlinkVars["SONAME"] = this->GetTargetFilePath(this->TargetNameSO);
+ cmNinjaDeps outputs;
+ const std::string soName = this->GetTargetFilePath(this->TargetNameSO);
+ // If one link has to be created.
+ if (targetOutputReal == soName || targetOutput == soName) {
+ symlinkVars["SONAME"] = soName;
+ } else {
+ symlinkVars["SONAME"] = "";
+ outputs.push_back(soName);
+ }
+ outputs.push_back(targetOutput);
cmGlobalNinjaGenerator::WriteBuild(this->GetBuildFileStream(),
"Create library symlink " + targetOutput,
"CMAKE_SYMLINK_LIBRARY",
- cmNinjaDeps(1, targetOutput),
+ outputs,
cmNinjaDeps(1, targetOutputReal),
emptyDeps,
emptyDeps,
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=990f77eab35675f323fb320a75e843eb7bddee21
commit 990f77eab35675f323fb320a75e843eb7bddee21
Author: Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Fri Jul 6 09:46:00 2012 +0200
Commit: David Cole <david.cole at kitware.com>
CommitDate: Mon Jul 9 14:15:07 2012 -0400
Ninja: remove int/size_t warning
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 23f42e4..b405905 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -558,7 +558,7 @@ void cmGlobalNinjaGenerator::AddRule(const std::string& name,
restat,
generator);
- this->RuleCmdLength[name] = command.size();
+ this->RuleCmdLength[name] = (int) command.size();
}
bool cmGlobalNinjaGenerator::HasRule(const std::string &name)
-----------------------------------------------------------------------
Summary of changes:
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list