diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2010-09-30 14:31:31 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2010-09-30 14:31:31 (GMT) |
| commit | d4927395baf43d3c399d7a708d2bae96a88db494 (patch) | |
| tree | 61555d997f8a55f1a91aea73f40c575cbe0098cf | |
| parent | bd5541038d9dac6130f921d10ad88fe1cdee6800 (diff) | |
| download | hdf5-d4927395baf43d3c399d7a708d2bae96a88db494.zip hdf5-d4927395baf43d3c399d7a708d2bae96a88db494.tar.gz hdf5-d4927395baf43d3c399d7a708d2bae96a88db494.tar.bz2 | |
[svn-r19496] Change ExternalProject Dependicies guard to positive match (Windows configure error)
Tested: Windows
| -rw-r--r-- | CMakeLists.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 105dcb9..7ae15c6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -572,7 +572,7 @@ IF (WIN32) # MESSAGE (STATUS "ZLIB_BIN_PATH: ${ZLIB_BIN_PATH}") ADD_CUSTOM_TARGET (ZLIB-Release-Copy ALL COMMAND ${CMAKE_COMMAND} -E copy_if_different ${ZLIB_BIN_PATH}/${ZLIB_DLL_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/ - COMMENT "Copying ${ZLIB_BIN_PATH}/${ZLIB_DLL_NAME}.dll to ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/" + COMMENT "Copying ${ZLIB_BIN_PATH}/${ZLIB_DLL_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX} to ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/" ) ENDIF (HDF5_ENABLE_Z_LIB_SUPPORT AND ZLIB_FOUND) @@ -583,7 +583,7 @@ IF (WIN32) # MESSAGE (STATUS "SZIP_BIN_PATH: ${SZIP_BIN_PATH}") ADD_CUSTOM_TARGET (SZIP-Release-Copy ALL COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SZIP_BIN_PATH}/${SZIP_DLL_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/ - COMMENT "Copying ${SZIP_BIN_PATH}/${SZIP_DLL_NAME}.dll to ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/" + COMMENT "Copying ${SZIP_BIN_PATH}/${SZIP_DLL_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX} to ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/" ) ENDIF (HDF5_ENABLE_SZIP_SUPPORT AND SZIP_FOUND) @@ -616,14 +616,14 @@ ENDIF (HDF5_USE_H5DUMP_PACKED_BITS) #----------------------------------------------------------------------------- ADD_SUBDIRECTORY (${HDF5_SOURCE_DIR}/src ${PROJECT_BINARY_DIR}/src) -IF (NOT HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "NO") +IF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN") IF (ZLIB_FOUND) ADD_DEPENDENCIES (${HDF5_LIB_TARGET} ZLIB) ENDIF (ZLIB_FOUND) IF (SZIP_FOUND) ADD_DEPENDENCIES (${HDF5_LIB_TARGET} SZIP) ENDIF (SZIP_FOUND) -ENDIF (NOT HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "NO") +ENDIF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN") #----------------------------------------------------------------------------- # Build utility to copy and strip X lines of file |