diff options
| author | David Cole <david.cole@kitware.com> | 2012-06-12 19:58:29 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-06-12 19:58:29 (GMT) |
| commit | e21bcdc6c657ac223d95c0ae92eb398e1659763d (patch) | |
| tree | 70296ed2f5d30a2f27be1ee060bbc1e0387dca7f /Modules | |
| parent | d6483cb542b91bb9297125cdaf9017fd8785ccd3 (diff) | |
| parent | 7c912af2d06caeb0632b3f26cc9ee9bd8f0e6076 (diff) | |
| download | CMake-e21bcdc6c657ac223d95c0ae92eb398e1659763d.zip CMake-e21bcdc6c657ac223d95c0ae92eb398e1659763d.tar.gz CMake-e21bcdc6c657ac223d95c0ae92eb398e1659763d.tar.bz2 | |
Merge topic 'FindBZip2-GnuWin32-registry'
7c912af FindBZip2: Search locations in GnuWin32 registry
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindBZip2.cmake | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Modules/FindBZip2.cmake b/Modules/FindBZip2.cmake index 7130192..ce7f255 100644 --- a/Modules/FindBZip2.cmake +++ b/Modules/FindBZip2.cmake @@ -22,11 +22,15 @@ # (To distribute this file outside of CMake, substitute the full # License text for the above reference.) -FIND_PATH(BZIP2_INCLUDE_DIR bzlib.h ) +SET(_BZIP2_PATHS PATHS + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\GnuWin32\\Bzip2;InstallPath]" + ) + +FIND_PATH(BZIP2_INCLUDE_DIR bzlib.h ${_BZIP2_PATHS} PATH_SUFFIXES include) IF (NOT BZIP2_LIBRARIES) - FIND_LIBRARY(BZIP2_LIBRARY_RELEASE NAMES bz2 bzip2 ) - FIND_LIBRARY(BZIP2_LIBRARY_DEBUG NAMES bzip2d ) + FIND_LIBRARY(BZIP2_LIBRARY_RELEASE NAMES bz2 bzip2 ${_BZIP2_PATHS} PATH_SUFFIXES lib) + FIND_LIBRARY(BZIP2_LIBRARY_DEBUG NAMES bzip2d ${_BZIP2_PATHS} PATH_SUFFIXES lib) INCLUDE(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake) SELECT_LIBRARY_CONFIGURATIONS(BZIP2) |