diff options
| author | Nils Gladitz <nilsgladitz@gmail.com> | 2014-07-29 19:33:38 (GMT) |
|---|---|---|
| committer | Nils Gladitz <nilsgladitz@gmail.com> | 2014-07-29 19:33:38 (GMT) |
| commit | 250ad08a085f54c1445369cdf3bf278613c6c0e5 (patch) | |
| tree | 9404c116816fcce44c2118b25091ab588f772a7e | |
| parent | afe21fc3c43af0c031a77b3b48041d35f248f481 (diff) | |
| download | CMake-250ad08a085f54c1445369cdf3bf278613c6c0e5.zip CMake-250ad08a085f54c1445369cdf3bf278613c6c0e5.tar.gz CMake-250ad08a085f54c1445369cdf3bf278613c6c0e5.tar.bz2 | |
Ninja: Remove _COMPILER_LINKER_OPTION_FLAG_ remnants
| -rw-r--r-- | Modules/Platform/Windows-df.cmake | 1 | ||||
| -rw-r--r-- | Source/cmNinjaNormalTargetGenerator.cxx | 7 |
2 files changed, 1 insertions, 7 deletions
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 = ""; } |