[Cmake-commits] CMake branch, next, updated. v3.7.0-1376-gcc653be

[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  cc653bea23a94e8c494203954954efd319d31cda (commit)
       via  7abb12c826cad6e5847c32d4769c076732581901 (commit)
       via  d3f9f5120c05e4756d7ee1ed81917f74583455a2 (commit)
      from  23e8657e5854ff3fef364ec490a14fb06556f04d (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=cc653bea23a94e8c494203954954efd319d31cda
commit cc653bea23a94e8c494203954954efd319d31cda
Merge: 23e8657 7abb12c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 28 16:33:41 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 28 16:33:41 2016 -0500

    Merge topic 'FindDevIL-updates' into next
    
    7abb12c8 FindDevIL: Make the ILUT library optional
    d3f9f512 FindDevIL: fail properly when library is not found.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7abb12c826cad6e5847c32d4769c076732581901
commit 7abb12c826cad6e5847c32d4769c076732581901
Author:     Vladimír Vondruš <mosra at centrum.cz>
AuthorDate: Thu Nov 24 12:40:22 2016 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 28 16:31:25 2016 -0500

    FindDevIL: Make the ILUT library optional
    
    Some distributions (such as ArchLinux) have only the IL and ILU
    libraries and since these are mainly used, the module should succeed
    even though ILUT was not found.  Removed it from the FPHSA() macro call,
    making it effectively optional.

diff --git a/Modules/FindDevIL.cmake b/Modules/FindDevIL.cmake
index 4b6128b..45fab82 100644
--- a/Modules/FindDevIL.cmake
+++ b/Modules/FindDevIL.cmake
@@ -69,4 +69,4 @@ find_library(ILU_LIBRARIES
 
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(DevIL DEFAULT_MSG
                                   IL_LIBRARIES ILU_LIBRARIES
-                                  ILUT_LIBRARIES IL_INCLUDE_DIR)
+                                  IL_INCLUDE_DIR)

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d3f9f5120c05e4756d7ee1ed81917f74583455a2
commit d3f9f5120c05e4756d7ee1ed81917f74583455a2
Author:     Vladimír Vondruš <mosra at centrum.cz>
AuthorDate: Thu Nov 24 12:26:56 2016 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 28 16:31:04 2016 -0500

    FindDevIL: fail properly when library is not found.
    
    Due to a mismatch between module name and name passed to FPHSA() the
    macro printed an error message but the error was not caught up by CMake.
    Fix the typo.

diff --git a/Modules/FindDevIL.cmake b/Modules/FindDevIL.cmake
index dc8e38a..4b6128b 100644
--- a/Modules/FindDevIL.cmake
+++ b/Modules/FindDevIL.cmake
@@ -67,6 +67,6 @@ find_library(ILU_LIBRARIES
 
 #message("ILU_LIBRARIES is ${ILU_LIBRARIES}")
 
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(IL DEFAULT_MSG
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(DevIL DEFAULT_MSG
                                   IL_LIBRARIES ILU_LIBRARIES
                                   ILUT_LIBRARIES IL_INCLUDE_DIR)

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

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


hooks/post-receive
-- 
CMake