[Cmake-commits] CMake branch, next, updated. v2.8.9-132-gbff5c29

[David Cole]

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  bff5c2968716edc750a256b8f66c588af50b80bf (commit)
       via  e4e6ea0714dd9a1edf157676e49dbf0ef9abd0d2 (commit)
      from  84ec0eee461f97f0f80dd522153ed000cf3a4216 (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=bff5c2968716edc750a256b8f66c588af50b80bf
commit bff5c2968716edc750a256b8f66c588af50b80bf
Merge: 84ec0ee e4e6ea0
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Fri Aug 17 10:46:08 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Aug 17 10:46:08 2012 -0400

    Merge topic 'fix-13315-incorrect-mfc-file-name' into next
    
    e4e6ea0 InstallRequiredSystemLibraries: Use correct file names (#13315)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e4e6ea0714dd9a1edf157676e49dbf0ef9abd0d2
commit e4e6ea0714dd9a1edf157676e49dbf0ef9abd0d2
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Fri Aug 17 09:48:24 2012 -0400
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Fri Aug 17 09:48:24 2012 -0400

    InstallRequiredSystemLibraries: Use correct file names (#13315)
    
    The Spanish language MFC localization dll changed names from
    VS 9 to 10. Use the correct file name ending with "esn.dll"
    instead of the now non-existent one ending with "esp.dll"
    
    Also, add the existing, but missing from our rules until now,
    Russian language module.
    
    Alphabetize the list while we're at it for easier reading in
    the future.
    
    We may want to consider adding some file(GLOB code here to
    minimize the risk of missing files added in future versions
    of VS.

diff --git a/Modules/InstallRequiredSystemLibraries.cmake b/Modules/InstallRequiredSystemLibraries.cmake
index 19b06d5..bd97501 100644
--- a/Modules/InstallRequiredSystemLibraries.cmake
+++ b/Modules/InstallRequiredSystemLibraries.cmake
@@ -312,13 +312,14 @@ if(MSVC)
       set(__install__libs ${__install__libs}
         "${MSVC${v}_MFCLOC_DIR}/mfc${v}0chs.dll"
         "${MSVC${v}_MFCLOC_DIR}/mfc${v}0cht.dll"
-        "${MSVC${v}_MFCLOC_DIR}/mfc${v}0enu.dll"
-        "${MSVC${v}_MFCLOC_DIR}/mfc${v}0esp.dll"
         "${MSVC${v}_MFCLOC_DIR}/mfc${v}0deu.dll"
+        "${MSVC${v}_MFCLOC_DIR}/mfc${v}0enu.dll"
+        "${MSVC${v}_MFCLOC_DIR}/mfc${v}0esn.dll"
         "${MSVC${v}_MFCLOC_DIR}/mfc${v}0fra.dll"
         "${MSVC${v}_MFCLOC_DIR}/mfc${v}0ita.dll"
         "${MSVC${v}_MFCLOC_DIR}/mfc${v}0jpn.dll"
         "${MSVC${v}_MFCLOC_DIR}/mfc${v}0kor.dll"
+        "${MSVC${v}_MFCLOC_DIR}/mfc${v}0rus.dll"
         )
     endmacro()
 

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

Summary of changes:
 Modules/InstallRequiredSystemLibraries.cmake |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake