mirror of https://github.com/QMCPACK/qmcpack.git
Fixing bug configuring HDF5 with CMake 2.8.10
git-svn-id: https://subversion.assembla.com/svn/qmcdev/trunk@6628 e5b18d87-469d-4833-9cc0-8cdfa06e9491
This commit is contained in:
parent
7979d5af7e
commit
ad2d5ad933
|
@ -35,6 +35,7 @@ SET(QMC_BUILD_LEVEL 3 CACHE INTEGER
|
||||||
IF ( NOT CMAKE_BUILD_TYPE )
|
IF ( NOT CMAKE_BUILD_TYPE )
|
||||||
SET( CMAKE_BUILD_TYPE Release )
|
SET( CMAKE_BUILD_TYPE Release )
|
||||||
ENDIF()
|
ENDIF()
|
||||||
|
STRING( TOUPPER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE )
|
||||||
|
|
||||||
######################################################################
|
######################################################################
|
||||||
#define the paths for library and executable for out-of-soruce compilation
|
#define the paths for library and executable for out-of-soruce compilation
|
||||||
|
@ -568,6 +569,13 @@ find_package(HDF5)
|
||||||
IF(HDF5_FOUND)
|
IF(HDF5_FOUND)
|
||||||
SET(HAVE_LIBHDF5 1)
|
SET(HAVE_LIBHDF5 1)
|
||||||
INCLUDE_DIRECTORIES(${HDF5_INCLUDE_DIR})
|
INCLUDE_DIRECTORIES(${HDF5_INCLUDE_DIR})
|
||||||
|
IF ( CMAKE_BUILD_TYPE AND HDF5_LIBRARIES_DEBUG )
|
||||||
|
IF ( CMAKE_BUILD_TYPE MATCHES DEBUG )
|
||||||
|
SET( HDF5_LIBRARIES ${HDF5_LIBRARIES_DEBUG} )
|
||||||
|
ELSE()
|
||||||
|
SET( HDF5_LIBRARIES ${HDF5_LIBRARIES_RELEASE} )
|
||||||
|
ENDIF()
|
||||||
|
ENDIF()
|
||||||
SET(QMC_UTIL_LIBS ${QMC_UTIL_LIBS} ${HDF5_LIBRARIES})
|
SET(QMC_UTIL_LIBS ${QMC_UTIL_LIBS} ${HDF5_LIBRARIES})
|
||||||
if(ZLIB_LIBRARY)
|
if(ZLIB_LIBRARY)
|
||||||
SET(QMC_UTIL_LIBS ${QMC_UTIL_LIBS} ${ZLIB_LIBRARY})
|
SET(QMC_UTIL_LIBS ${QMC_UTIL_LIBS} ${ZLIB_LIBRARY})
|
||||||
|
|
Loading…
Reference in New Issue