[Cmake-commits] CMake branch, next, updated. v2.8.12-4303-gc7e4aad

Stephen Kelly steveire at gmail.com
Tue Oct 22 17:25:28 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  c7e4aad53b9b89bcfda7ac1c201a6243adedb168 (commit)
       via  ed99ec99953ed0f76f384d612f0198e7cd0bc56c (commit)
      from  cca0b6c1d0082f8eaa09549a3badfedd1b0da4e3 (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=c7e4aad53b9b89bcfda7ac1c201a6243adedb168
commit c7e4aad53b9b89bcfda7ac1c201a6243adedb168
Merge: cca0b6c ed99ec9
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 22 17:25:26 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 22 17:25:26 2013 -0400

    Merge topic 'fix-tll-static-private' into next
    
    ed99ec9 Remove directory from the link flags.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ed99ec99953ed0f76f384d612f0198e7cd0bc56c
commit ed99ec99953ed0f76f384d612f0198e7cd0bc56c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 22 23:25:03 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 22 23:25:03 2013 +0200

    Remove directory from the link flags.

diff --git a/Tests/CMakeCommands/target_link_libraries/cmp0022/CMakeLists.txt b/Tests/CMakeCommands/target_link_libraries/cmp0022/CMakeLists.txt
index 7a5c621..b20be2c 100644
--- a/Tests/CMakeCommands/target_link_libraries/cmp0022/CMakeLists.txt
+++ b/Tests/CMakeCommands/target_link_libraries/cmp0022/CMakeLists.txt
@@ -24,7 +24,7 @@ generate_export_header(staticlib2)
 add_library(staticlib3 STATIC staticlib3.cpp)
 generate_export_header(staticlib3)
 target_link_libraries(staticlib1 LINK_PUBLIC staticlib2)
-target_link_libraries(staticlib1 LINK_PRIVATE "-L${CMAKE_CURRENT_BINARY_DIR} -Wl,--start-group -lstaticlib3 -Wl,--end-group")
+target_link_libraries(staticlib1 LINK_PRIVATE "-Wl,--start-group -lstaticlib3 -Wl,--end-group")
 
 add_executable(staticlib_exe staticlib_exe.cpp)
 target_link_libraries(staticlib_exe staticlib1)

-----------------------------------------------------------------------

Summary of changes:
 .../target_link_libraries/cmp0022/CMakeLists.txt   |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list