[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5467-g7b587df
Stephen Kelly
steveire at gmail.com
Tue Nov 19 15:52:11 EST 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 7b587df41b0f5c7fc24acc4fb10c2de32ac8bc23 (commit)
via 536a34e73251667ce4d78de5a662ea44e7e8f9b6 (commit)
from f0449b4421c4c972f5ad8fa5023c2214f7be42e4 (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=7b587df41b0f5c7fc24acc4fb10c2de32ac8bc23
commit 7b587df41b0f5c7fc24acc4fb10c2de32ac8bc23
Merge: f0449b4 536a34e
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Nov 19 15:52:09 2013 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 19 15:52:09 2013 -0500
Merge topic 'cross-compiling-toolchain-variables' into next
536a34e Re-order.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=536a34e73251667ce4d78de5a662ea44e7e8f9b6
commit 536a34e73251667ce4d78de5a662ea44e7e8f9b6
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Nov 19 21:51:14 2013 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Nov 19 21:51:14 2013 +0100
Re-order.
This shouldn't make a difference, but maybe it does...
diff --git a/Tests/StagingPrefix/Producer/CMakeLists.txt b/Tests/StagingPrefix/Producer/CMakeLists.txt
index 230d092..eb3d98f 100644
--- a/Tests/StagingPrefix/Producer/CMakeLists.txt
+++ b/Tests/StagingPrefix/Producer/CMakeLists.txt
@@ -5,9 +5,9 @@ project(Producer)
add_library(foo SHARED foo.cpp)
install(TARGETS foo EXPORT fooTargets
+ RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
- RUNTIME DESTINATION bin
INCLUDES DESTINATION include/foo
)
install(FILES foo.h DESTINATION include/foo)
@@ -19,8 +19,8 @@ install(EXPORT fooTargets
add_library(bar SHARED bar.cpp)
install(TARGETS bar
+ RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
- RUNTIME DESTINATION bin
)
install(FILES bar.h DESTINATION include/bar)
-----------------------------------------------------------------------
Summary of changes:
Tests/StagingPrefix/Producer/CMakeLists.txt | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list