[Cmake-commits] CMake branch, next, updated. v3.0.0-4619-g7d5a57c

[Nils Gladitz]

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  7d5a57c48614053a182eb46c3badd5886adcb894 (commit)
       via  250ad08a085f54c1445369cdf3bf278613c6c0e5 (commit)
      from  ab5ffdfbbdfdc25736a4193b070819225eac23c8 (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=7d5a57c48614053a182eb46c3badd5886adcb894
commit 7d5a57c48614053a182eb46c3badd5886adcb894
Merge: ab5ffdf 250ad08
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Tue Jul 29 15:34:32 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jul 29 15:34:32 2014 -0400

    Merge topic 'remove-link-remnants' into next
    
    250ad08a Ninja: Remove _COMPILER_LINKER_OPTION_FLAG_ remnants


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=250ad08a085f54c1445369cdf3bf278613c6c0e5
commit 250ad08a085f54c1445369cdf3bf278613c6c0e5
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Tue Jul 29 21:33:38 2014 +0200
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Tue Jul 29 21:33:38 2014 +0200

    Ninja: Remove _COMPILER_LINKER_OPTION_FLAG_ remnants

diff --git a/Modules/Platform/Windows-df.cmake b/Modules/Platform/Windows-df.cmake
index 8dfb610..211cc9d 100644
--- a/Modules/Platform/Windows-df.cmake
+++ b/Modules/Platform/Windows-df.cmake
@@ -26,7 +26,6 @@ set(CMAKE_Fortran_COMPILE_OBJECT
 
 set(CMAKE_COMPILE_RESOURCE "rc <FLAGS> /fo<OBJECT> <SOURCE>")
 
-set(CMAKE_${lang}_COMPILER_LINKER_OPTION_FLAG_EXECUTABLE "/link")
 set(CMAKE_Fortran_LINK_EXECUTABLE
     "<CMAKE_Fortran_COMPILER> ${CMAKE_CL_NOLOGO} ${CMAKE_START_TEMP_FILE} <FLAGS> /exe:<TARGET> <OBJECTS> /link <CMAKE_Fortran_LINK_FLAGS> <LINK_FLAGS> <LINK_LIBRARIES>${CMAKE_END_TEMP_FILE}")
 
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 15a1b32..e344df4 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -187,12 +187,7 @@ cmNinjaNormalTargetGenerator
         responseFlag += rspfile;
 
         // build response file content
-        std::string linkOptionVar = cmakeVarLang;
-        linkOptionVar += "_COMPILER_LINKER_OPTION_FLAG_";
-        linkOptionVar += cmTarget::GetTargetTypeName(targetType);
-        const std::string linkOption =
-                GetMakefile()->GetSafeDefinition(linkOptionVar);
-        rspcontent = "$in_newline "+linkOption+" $LINK_PATH $LINK_LIBRARIES";
+        rspcontent = "$in_newline $LINK_PATH $LINK_LIBRARIES";
         vars.Objects = responseFlag.c_str();
         vars.LinkLibraries = "";
     }

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

Summary of changes:
 Modules/Platform/Windows-df.cmake       |    1 -
 Source/cmNinjaNormalTargetGenerator.cxx |    7 +------
 2 files changed, 1 insertion(+), 7 deletions(-)


hooks/post-receive
-- 
CMake