[Cmake-commits] CMake branch, next, updated. v3.6.0-752-g4328891

[Roger Leigh]

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  4328891e82e4231f513a60aa77afad829c67f8bc (commit)
       via  a3ef069702fde5d688118031d938bc0774c348a5 (commit)
       via  aa0b737046e16fe873dc82e1bb8edbada6ac3b34 (commit)
      from  2f77bbd188fe154580f07070eb10bcec244e494a (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=4328891e82e4231f513a60aa77afad829c67f8bc
commit 4328891e82e4231f513a60aa77afad829c67f8bc
Merge: 2f77bbd a3ef069
Author:     Roger Leigh <rleigh at codelibre.net>
AuthorDate: Sun Jul 10 14:52:20 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Jul 10 14:52:20 2016 -0400

    Merge topic 'findicu' into next
    
    a3ef0697 FindICU: Include modules from current list dir
    aa0b7370 FindICU: Remove duplicate program list


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a3ef069702fde5d688118031d938bc0774c348a5
commit a3ef069702fde5d688118031d938bc0774c348a5
Author:     Roger Leigh <rleigh at codelibre.net>
AuthorDate: Sun Jul 10 18:51:03 2016 +0000
Commit:     Roger Leigh <rleigh at codelibre.net>
CommitDate: Sun Jul 10 18:51:03 2016 +0000

    FindICU: Include modules from current list dir

diff --git a/Modules/FindICU.cmake b/Modules/FindICU.cmake
index 7f64019..fd333bb 100644
--- a/Modules/FindICU.cmake
+++ b/Modules/FindICU.cmake
@@ -170,7 +170,7 @@ function(_ICU_FIND)
       HINTS ${icu_roots}
       PATH_SUFFIXES ${icu_library_suffixes}
       DOC "ICU ${component} library (debug)")
-    include(SelectLibraryConfigurations)
+    include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake)
     select_library_configurations(ICU_${component_upcase})
     mark_as_advanced("${component_cache_release}" "${component_cache_debug}")
     if(${component_cache})
@@ -224,7 +224,7 @@ endfunction()
 
 _ICU_FIND()
 
-include(FindPackageHandleStandardArgs)
+include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(ICU
                                   FOUND_VAR ICU_FOUND
                                   REQUIRED_VARS ICU_INCLUDE_DIR

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aa0b737046e16fe873dc82e1bb8edbada6ac3b34
commit aa0b737046e16fe873dc82e1bb8edbada6ac3b34
Author:     Roger Leigh <rleigh at codelibre.net>
AuthorDate: Sun Jul 10 18:48:26 2016 +0000
Commit:     Roger Leigh <rleigh at codelibre.net>
CommitDate: Sun Jul 10 18:48:26 2016 +0000

    FindICU: Remove duplicate program list

diff --git a/Modules/FindICU.cmake b/Modules/FindICU.cmake
index 0b8fdd9..7f64019 100644
--- a/Modules/FindICU.cmake
+++ b/Modules/FindICU.cmake
@@ -122,24 +122,6 @@ function(_ICU_FIND)
     endif()
   endif()
 
-  set(icu_programs
-    gencnval
-    icuinfo
-    genbrk
-    icu-config
-    genrb
-    gendict
-    derb
-    pkgdata
-    uconv
-    gencfu
-    makeconv
-    gennorm2
-    genccode
-    gensprep
-    icupkg
-    gencmn)
-
   # Find all ICU programs
   foreach(program ${icu_programs})
     string(TOUPPER "${program}" program_upcase)

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

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


hooks/post-receive
-- 
CMake