[Cmake-commits] CMake branch, next, updated. v3.3.0-rc2-683-gf57487c

[Brad King]

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  f57487c0de4735d1fa995d28a4262cd093046564 (commit)
       via  8306108fd6ed58833d5d33cf6425665457dcd902 (commit)
      from  b704a70345c60887b39b438cadd29c9d2f08abfd (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=f57487c0de4735d1fa995d28a4262cd093046564
commit f57487c0de4735d1fa995d28a4262cd093046564
Merge: b704a70 8306108
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jun 26 08:36:07 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jun 26 08:36:07 2015 -0400

    Merge topic 'compiler-id-simplify-ide-src' into next
    
    8306108f CMakeDetermineCompilerId: Simplify src reference in IDE projects


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8306108fd6ed58833d5d33cf6425665457dcd902
commit 8306108fd6ed58833d5d33cf6425665457dcd902
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jun 25 15:15:17 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jun 25 15:16:53 2015 -0400

    CMakeDetermineCompilerId: Simplify src reference in IDE projects
    
    When constructing the "id_src" value for substitution into VS or Xcode
    compiler id projects, the input "src" variable already contains the file
    name with no path so we do not need get_filename_component.  We know
    this because CMAKE_DETERMINE_COMPILER_ID_WRITE already references
    "${src}" with this assumption.

diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake
index 68f2194..487429b 100644
--- a/Modules/CMakeDetermineCompilerId.cmake
+++ b/Modules/CMakeDetermineCompilerId.cmake
@@ -217,7 +217,7 @@ Id flags: ${testflags}
       set(id_subsystem 1)
     endif()
     set(id_dir ${CMAKE_${lang}_COMPILER_ID_DIR})
-    get_filename_component(id_src "${src}" NAME)
+    set(id_src "${src}")
     configure_file(${CMAKE_ROOT}/Modules/CompilerId/VS-${v}.${ext}.in
       ${id_dir}/CompilerId${lang}.${ext} @ONLY)
     if(CMAKE_VS_MSBUILD_COMMAND AND NOT lang STREQUAL "Fortran")
@@ -256,7 +256,7 @@ Id flags: ${testflags}
     set(id_lang "${lang}")
     set(id_type ${CMAKE_${lang}_COMPILER_XCODE_TYPE})
     set(id_dir ${CMAKE_${lang}_COMPILER_ID_DIR})
-    get_filename_component(id_src "${src}" NAME)
+    set(id_src "${src}")
     if(CMAKE_XCODE_PLATFORM_TOOLSET)
       set(id_toolset "GCC_VERSION = ${CMAKE_XCODE_PLATFORM_TOOLSET};")
     else()

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

Summary of changes:
 Modules/CMakeDetermineCompilerId.cmake |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake