[Cmake-commits] CMake branch, next, updated. v3.5.2-830-gaa57815

Brad King brad.king at kitware.com
Thu Jun 2 09:39:35 EDT 2016


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  aa578154373931c19d08c5e2d9b74e72cbe23a33 (commit)
       via  89317915d9add953d000e6c4b962b7fbb4190c1d (commit)
      from  941bf80e869f2b9d4ba401afff4d801c739b73e5 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aa578154373931c19d08c5e2d9b74e72cbe23a33
commit aa578154373931c19d08c5e2d9b74e72cbe23a33
Merge: 941bf80 8931791
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jun 2 09:39:35 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jun 2 09:39:35 2016 -0400

    Merge topic 'fix-ti-link-order' into next
    
    89317915 Compiler/TI: Pass libraries as last part to linker


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=89317915d9add953d000e6c4b962b7fbb4190c1d
commit 89317915d9add953d000e6c4b962b7fbb4190c1d
Author:     Alexander Stein <alexander.stein at systec-electronic.com>
AuthorDate: Thu Jun 2 10:53:51 2016 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jun 2 09:39:25 2016 -0400

    Compiler/TI: Pass libraries as last part to linker
    
    If e.g. libc.a is passed before any objects the linker raises the follwing
    warning: cannot resolve archive libc.a to a compatible library, as no
    input files have been encountered
    In the end the library is skipped and missing symbols occur.
    
    Signed-off-by: Alexander Stein <alexander.stein at systec-electronic.com>

diff --git a/Modules/Compiler/TI-C.cmake b/Modules/Compiler/TI-C.cmake
index 479666c..ebc79f4 100644
--- a/Modules/Compiler/TI-C.cmake
+++ b/Modules/Compiler/TI-C.cmake
@@ -7,4 +7,4 @@ set(CMAKE_C_CREATE_PREPROCESSED_SOURCE "<CMAKE_C_COMPILER> --preproc_only --c_fi
 
 set(CMAKE_C_COMPILE_OBJECT  "<CMAKE_C_COMPILER> --compile_only --c_file=<SOURCE> <DEFINES> <INCLUDES> <FLAGS> --output_file=<OBJECT>")
 set(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> -r <TARGET> <OBJECTS>")
-set(CMAKE_C_LINK_EXECUTABLE "<CMAKE_C_COMPILER> --run_linker --output_file=<TARGET> --map_file=<TARGET>.map <CMAKE_C_LINK_FLAGS> <LINK_LIBRARIES> <LINK_FLAGS> <OBJECTS>")
+set(CMAKE_C_LINK_EXECUTABLE "<CMAKE_C_COMPILER> --run_linker --output_file=<TARGET> --map_file=<TARGET>.map <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> <LINK_LIBRARIES>")

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

Summary of changes:


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list