Updates from develop
This commit is contained in:
Allen Byrne
@@ -9,136 +9,108 @@
|
||||
# If you do not have access to either file, you may request a copy from
|
||||
# help@hdfgroup.org.
|
||||
#
|
||||
#########################################################################
|
||||
|
||||
# - Derived from the FindTiff.cmake and FindJPEG.cmake that is included with cmake
|
||||
# FindSZIP
|
||||
|
||||
# - Find SZIP library
|
||||
# - Derived from the FindTiff.cmake that is included with cmake
|
||||
# Find the native SZIP includes and library
|
||||
# This module defines
|
||||
# SZIP_INCLUDE_DIRS, where to find tiff.h, etc.
|
||||
|
||||
# Imported targets
|
||||
##################
|
||||
|
||||
# This module defines the following :prop_tgt:`IMPORTED` targets:
|
||||
#
|
||||
# SZIP::SZIP
|
||||
# The SZIP library, if found.
|
||||
#
|
||||
# Result variables
|
||||
###################
|
||||
|
||||
This module will set the following variables in your project:
|
||||
|
||||
# SZIP_FOUND, true if the SZIP headers and libraries were found.
|
||||
# SZIP_INCLUDE_DIR, the directory containing the SZIP headers.
|
||||
# SZIP_INCLUDE_DIRS, the directory containing the SZIP headers.
|
||||
# SZIP_LIBRARIES, libraries to link against to use SZIP.
|
||||
# SZIP_FOUND, If false, do not try to use SZIP.
|
||||
# also defined, but not for general use are
|
||||
|
||||
# Cache variables
|
||||
#################
|
||||
|
||||
# The following variables may also be set:
|
||||
|
||||
# SZIP_LIBRARY, where to find the SZIP library.
|
||||
# SZIP_LIBRARY_DEBUG - Debug version of SZIP library
|
||||
# SZIP_LIBRARY_RELEASE - Release Version of SZIP library
|
||||
|
||||
# message (STATUS "Finding SZIP library and headers..." )
|
||||
|
||||
############################################
|
||||
#
|
||||
# Check the existence of the libraries.
|
||||
#
|
||||
############################################
|
||||
# This macro was taken directly from the FindQt4.cmake file that is included
|
||||
# with the CMake distribution. This is NOT my work. All work was done by the
|
||||
# original authors of the FindQt4.cmake file. Only minor modifications were
|
||||
# made to remove references to Qt and make this file more generally applicable
|
||||
#########################################################################
|
||||
|
||||
macro (SZIP_ADJUST_LIB_VARS basename)
|
||||
if (${basename}_INCLUDE_DIR)
|
||||
|
||||
# if only the release version was found, set the debug variable also to the release version
|
||||
if (${basename}_LIBRARY_RELEASE AND NOT ${basename}_LIBRARY_DEBUG)
|
||||
set (${basename}_LIBRARY_DEBUG ${${basename}_LIBRARY_RELEASE})
|
||||
set (${basename}_LIBRARY ${${basename}_LIBRARY_RELEASE})
|
||||
set (${basename}_LIBRARIES ${${basename}_LIBRARY_RELEASE})
|
||||
endif ()
|
||||
find_path(SZIP_INCLUDE_DIR szlib.h)
|
||||
|
||||
# if only the debug version was found, set the release variable also to the debug version
|
||||
if (${basename}_LIBRARY_DEBUG AND NOT ${basename}_LIBRARY_RELEASE)
|
||||
set (${basename}_LIBRARY_RELEASE ${${basename}_LIBRARY_DEBUG})
|
||||
set (${basename}_LIBRARY ${${basename}_LIBRARY_DEBUG})
|
||||
set (${basename}_LIBRARIES ${${basename}_LIBRARY_DEBUG})
|
||||
endif ()
|
||||
if (${basename}_LIBRARY_DEBUG AND ${basename}_LIBRARY_RELEASE)
|
||||
# if the generator supports configuration types then set
|
||||
# optimized and debug libraries, or if the CMAKE_BUILD_TYPE has a value
|
||||
if (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
|
||||
set (${basename}_LIBRARY optimized ${${basename}_LIBRARY_RELEASE} debug ${${basename}_LIBRARY_DEBUG})
|
||||
else ()
|
||||
# if there are no configuration types and CMAKE_BUILD_TYPE has no value
|
||||
# then just use the release libraries
|
||||
set (${basename}_LIBRARY ${${basename}_LIBRARY_RELEASE} )
|
||||
endif ()
|
||||
set (${basename}_LIBRARIES optimized ${${basename}_LIBRARY_RELEASE} debug ${${basename}_LIBRARY_DEBUG})
|
||||
endif ()
|
||||
set(szip_names ${SZIP_NAMES} sz szip szip-static libsz libszip libszip-static)
|
||||
foreach(name ${szip_names})
|
||||
list(APPEND szip_names_debug "${name}d")
|
||||
endforeach()
|
||||
|
||||
set (${basename}_LIBRARY ${${basename}_LIBRARY} CACHE FILEPATH "The ${basename} library")
|
||||
if(NOT SZIP_LIBRARY)
|
||||
find_library(SZIP_LIBRARY_RELEASE NAMES ${szip_names})
|
||||
find_library(SZIP_LIBRARY_DEBUG NAMES ${szip_names_debug})
|
||||
include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake)
|
||||
select_library_configurations(SZIP)
|
||||
mark_as_advanced(SZIP_LIBRARY_RELEASE SZIP_LIBRARY_DEBUG)
|
||||
endif()
|
||||
unset(szip_names)
|
||||
unset(szip_names_debug)
|
||||
|
||||
if (${basename}_LIBRARY)
|
||||
set (${basename}_FOUND 1)
|
||||
endif ()
|
||||
endif ()
|
||||
if(SZIP_INCLUDE_DIR AND EXISTS "${SZIP_INCLUDE_DIR}/SZconfig.h")
|
||||
file(STRINGS "${SZIP_INCLUDE_DIR}/SZconfig.h" szip_version_str
|
||||
REGEX "^#define[\t ]+SZIP_PACKAGE_VERSION[\t ]+.*")
|
||||
|
||||
# Make variables changeble to the advanced user
|
||||
MARK_AS_ADVANCED (${basename}_LIBRARY ${basename}_LIBRARY_RELEASE ${basename}_LIBRARY_DEBUG ${basename}_INCLUDE_DIR )
|
||||
endmacro ()
|
||||
string(REGEX REPLACE "^#define[\t ]+SZIP_PACKAGE_VERSION[\t ]+([0-9]+).*"
|
||||
"\\1" SZIP_VERSION "${szip_version_str}")
|
||||
unset(szip_version_str)
|
||||
endif()
|
||||
|
||||
include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
|
||||
find_package_handle_standard_args(SZIP
|
||||
REQUIRED_VARS SZIP_LIBRARY SZIP_INCLUDE_DIR
|
||||
VERSION_VAR SZIP_VERSION)
|
||||
|
||||
# Look for the header file.
|
||||
set (SZIP_INCLUDE_SEARCH_DIRS
|
||||
$ENV{SZIP_INSTALL}/include
|
||||
$ENV{SZIP_INSTALL}/include/szip
|
||||
/usr/include
|
||||
/usr/include/szip
|
||||
)
|
||||
if(SZIP_FOUND)
|
||||
set(SZIP_LIBRARIES ${SZIP_LIBRARY})
|
||||
set(SZIP_INCLUDE_DIRS "${SZIP_INCLUDE_DIR}")
|
||||
|
||||
set (SZIP_LIB_SEARCH_DIRS
|
||||
$ENV{SZIP_INSTALL}/lib
|
||||
/usr/lib
|
||||
)
|
||||
if(NOT TARGET SZIP::SZIP)
|
||||
add_library(SZIP::SZIP UNKNOWN IMPORTED)
|
||||
if(SZIP_INCLUDE_DIRS)
|
||||
set_target_properties(SZIP::SZIP PROPERTIES
|
||||
INTERFACE_INCLUDE_DIRECTORIES "${SZIP_INCLUDE_DIRS}")
|
||||
endif()
|
||||
if(EXISTS "${SZIP_LIBRARY}")
|
||||
set_target_properties(SZIP::SZIP PROPERTIES
|
||||
IMPORTED_LINK_INTERFACE_LANGUAGES "C"
|
||||
IMPORTED_LOCATION "${SZIP_LIBRARY}")
|
||||
endif()
|
||||
if(EXISTS "${SZIP_LIBRARY_RELEASE}")
|
||||
set_property(TARGET SZIP::SZIP APPEND PROPERTY
|
||||
IMPORTED_CONFIGURATIONS RELEASE)
|
||||
set_target_properties(SZIP::SZIP PROPERTIES
|
||||
IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "C"
|
||||
IMPORTED_LOCATION_RELEASE "${SZIP_LIBRARY_RELEASE}")
|
||||
endif()
|
||||
if(EXISTS "${SZIP_LIBRARY_DEBUG}")
|
||||
set_property(TARGET SZIP::SZIP APPEND PROPERTY
|
||||
IMPORTED_CONFIGURATIONS DEBUG)
|
||||
set_target_properties(SZIP::SZIP PROPERTIES
|
||||
IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "C"
|
||||
IMPORTED_LOCATION_DEBUG "${SZIP_LIBRARY_DEBUG}")
|
||||
endif()
|
||||
endif()
|
||||
endif()
|
||||
|
||||
set (SZIP_BIN_SEARCH_DIRS
|
||||
$ENV{SZIP_INSTALL}/bin
|
||||
/usr/bin
|
||||
)
|
||||
|
||||
FIND_PATH (SZIP_INCLUDE_DIR
|
||||
NAMES szlib.h
|
||||
PATHS ${SZIP_INCLUDE_SEARCH_DIRS}
|
||||
NO_DEFAULT_PATH
|
||||
)
|
||||
|
||||
if (WIN32)
|
||||
set (SZIP_SEARCH_DEBUG_NAMES "sz_d;libsz_d")
|
||||
set (SZIP_SEARCH_RELEASE_NAMES "sz;libsz;libszip")
|
||||
else ()
|
||||
set (SZIP_SEARCH_DEBUG_NAMES "sz_d")
|
||||
set (SZIP_SEARCH_RELEASE_NAMES "sz;szip")
|
||||
endif ()
|
||||
|
||||
# Look for the library.
|
||||
FIND_LIBRARY (SZIP_LIBRARY_DEBUG
|
||||
NAMES ${SZIP_SEARCH_DEBUG_NAMES}
|
||||
PATHS ${SZIP_LIB_SEARCH_DIRS}
|
||||
NO_DEFAULT_PATH
|
||||
)
|
||||
|
||||
FIND_LIBRARY (SZIP_LIBRARY_RELEASE
|
||||
NAMES ${SZIP_SEARCH_RELEASE_NAMES}
|
||||
PATHS ${SZIP_LIB_SEARCH_DIRS}
|
||||
NO_DEFAULT_PATH
|
||||
)
|
||||
|
||||
SZIP_ADJUST_LIB_VARS (SZIP)
|
||||
|
||||
if (SZIP_INCLUDE_DIR AND SZIP_LIBRARY)
|
||||
set (SZIP_FOUND 1)
|
||||
set (SZIP_LIBRARIES ${SZIP_LIBRARY})
|
||||
set (SZIP_INCLUDE_DIRS ${SZIP_INCLUDE_DIR})
|
||||
if (SZIP_LIBRARY_DEBUG)
|
||||
get_filename_component (SZIP_LIBRARY_PATH ${SZIP_LIBRARY_DEBUG} PATH)
|
||||
set (SZIP_LIB_DIR ${SZIP_LIBRARY_PATH})
|
||||
elseif ()
|
||||
get_filename_component (SZIP_LIBRARY_PATH ${SZIP_LIBRARY_RELEASE} PATH)
|
||||
set (SZIP_LIB_DIR ${SZIP_LIBRARY_PATH})
|
||||
endif ()
|
||||
else ()
|
||||
set (SZIP_FOUND 0)
|
||||
set (SZIP_LIBRARIES)
|
||||
set (SZIP_INCLUDE_DIRS)
|
||||
endif ()
|
||||
mark_as_advanced(SZIP_LIBRARY SZIP_INCLUDE_DIR)
|
||||
|
||||
# Report the results.
|
||||
if (NOT SZIP_FOUND)
|
||||
@@ -153,29 +125,3 @@ if (NOT SZIP_FOUND)
|
||||
endif ()
|
||||
endif ()
|
||||
endif ()
|
||||
|
||||
if (SZIP_FOUND)
|
||||
include (CheckSymbolExists)
|
||||
#############################################
|
||||
# Find out if SZIP was build using dll's
|
||||
#############################################
|
||||
# Save required variable
|
||||
set (CMAKE_REQUIRED_INCLUDES_SAVE ${CMAKE_REQUIRED_INCLUDES})
|
||||
set (CMAKE_REQUIRED_FLAGS_SAVE ${CMAKE_REQUIRED_FLAGS})
|
||||
# Add SZIP_INCLUDE_DIR to CMAKE_REQUIRED_INCLUDES
|
||||
set (CMAKE_REQUIRED_INCLUDES "${CMAKE_REQUIRED_INCLUDES};${SZIP_INCLUDE_DIRS}")
|
||||
|
||||
# Restore CMAKE_REQUIRED_INCLUDES and CMAKE_REQUIRED_FLAGS variables
|
||||
set (CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES_SAVE})
|
||||
set (CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS_SAVE})
|
||||
#
|
||||
#############################################
|
||||
endif ()
|
||||
|
||||
if (FIND_SZIP_DEBUG)
|
||||
message (STATUS "SZIP_INCLUDE_DIR: ${SZIP_INCLUDE_DIR}")
|
||||
message (STATUS "SZIP_INCLUDE_DIRS: ${SZIP_INCLUDE_DIRS}")
|
||||
message (STATUS "SZIP_LIBRARY_DEBUG: ${SZIP_LIBRARY_DEBUG}")
|
||||
message (STATUS "SZIP_LIBRARY_RELEASE: ${SZIP_LIBRARY_RELEASE}")
|
||||
message (STATUS "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
|
||||
endif ()
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
# This file provides functions for Fortran support.
|
||||
#
|
||||
#-------------------------------------------------------------------------------
|
||||
ENABLE_LANGUAGE (Fortran)
|
||||
enable_language (Fortran)
|
||||
set (HDF_PREFIX "H5")
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
Reference in New Issue
Block a user