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 67849b913481d1e686742d8e543d0dc97495553e (commit)
via fe54ce57545ae1292a94b28405c4fa65e19f5748 (commit)
from 10aeccbfbd4d34050a470f59757a81cd553f0eb2 (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=67849b913481d1e686742d8e543d0dc97495553e
commit 67849b913481d1e686742d8e543d0dc97495553e
Merge: 10aeccb fe54ce5
Author: Chuck Atkins <chuck.atk...@kitware.com>
AuthorDate: Thu Jul 28 12:10:11 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Jul 28 12:10:11 2016 -0400
Merge topic 'add-findszip' into next
fe54ce57 FindSZIP: Better logic for handling ROOT_DIR search path
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fe54ce57545ae1292a94b28405c4fa65e19f5748
commit fe54ce57545ae1292a94b28405c4fa65e19f5748
Author: Chuck Atkins <chuck.atk...@kitware.com>
AuthorDate: Thu Jul 28 12:06:32 2016 -0400
Commit: Chuck Atkins <chuck.atk...@kitware.com>
CommitDate: Thu Jul 28 12:06:32 2016 -0400
FindSZIP: Better logic for handling ROOT_DIR search path
diff --git a/Modules/FindSZIP.cmake b/Modules/FindSZIP.cmake
index 872907d..db0a3c7 100644
--- a/Modules/FindSZIP.cmake
+++ b/Modules/FindSZIP.cmake
@@ -62,22 +62,19 @@ function(_SZIP_get_version)
endfunction()
# If the root dir is explicitly specified, then ONLY look there
+message("SZIP_ROOT_DIR: ${SZIP_ROOT_DIR}")
+message("ENV{SZIP_INSTALL}: $ENV{SZIP_INSTALL}")
if(SZIP_ROOT_DIR)
- set(SZIP_SEARCH_OPTS NO_DEFAULT_PATH)
-else()
- # Otherwise initialize from an environment variable
- set(SZIP_ROOT_DIR $ENV{SZIP_INSTALL})
-endif()
-
-# If we do have a root dir, use it as a hint
-if(SZIP_ROOT_DIR)
- set(SZIP_SEARCH_PATHS HINTS ${SZIP_ROOT_DIR})
+ set(SZIP_SEARCH_OPTS PATHS ${SZIP_ROOT_DIR} NO_DEFAULT_PATH)
+elseif(NOT ("$ENV{SZIP_INSTALL}" STREQUAL ""))
+ message("DEBUG: ENV{SZIP_INSTALL}")
+ set(SZIP_SEARCH_OPTS HINTS ENV SZIP_INSTALL)
endif()
# Find the main header
find_path(SZIP_INCLUDE_DIR NAMES szlib.h
- ${SZIP_SEARCH_PATHS} ${SZIP_SEARCH_OPTS}
- PATH_SUFFIXES include include/szip Include Include/szip)
+ ${SZIP_SEARCH_OPTS} PATH_SUFFIXES include include/szip Include Include/szip)
+mark_as_advanced(SZIP_INCLUDE_DIR)
# Find the release library
set(SZIP_LIBRARY_RELEASE_NAMES sz szip)
@@ -85,8 +82,7 @@ if(WIN32)
list(APPEND SZIP_LIBRARY_RELEASE_NAMES libsz libszip)
endif()
find_library(SZIP_LIBRARY_RELEASE NAMES ${SZIP_LIBRARY_RELEASE_NAMES}
- ${SZIP_SEARCH_PATHS} ${SZIP_SEARCH_OPTS}
- PATH_SUFFIXES lib Lib)
+ ${SZIP_SEARCH_OPTS} PATH_SUFFIXES lib Lib)
# Find the debug library
set(SZIP_LIBRARY_DEBUG_NAMES sz_d szip_d)
@@ -94,13 +90,12 @@ if(WIN32)
list(APPEND SZIP_LIBARY_DEBUG_NAMES libsz_d libszip_d)
endif()
find_library(SZIP_LIBRARY_DEBUG NAMES ${SZIP_LIBRARY_DEBUG_NAMES}
- ${SZIP_SEARCH_PATHS} ${SZIP_SEARCH_OPTS}
- PATH_SUFFIXES lib Lib)
+ ${SZIP_SEARCH_OPTS} PATH_SUFFIXES lib Lib)
include(SelectLibraryConfigurations)
select_library_configurations(SZIP)
-if(SZIP_INCLUDE_DIR AND SZIP_LIBRARY)
+if(SZIP_INCLUDE_DIR)
_SZIP_get_version()
endif()
-----------------------------------------------------------------------
Summary of changes:
Modules/FindSZIP.cmake | 27 +++++++++++----------------
1 file changed, 11 insertions(+), 16 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
