diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2010-09-30 14:31:45 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2010-09-30 14:31:45 (GMT) |
| commit | e171b57b999a4d0b6c0b97c8138880056fc4a956 (patch) | |
| tree | 2113522a6bedcc7e2d9b6a57b3ebd87cd213ed67 /CMakeLists.txt | |
| parent | 41fe3ed5cc648d266116998e1b41aff420c5d758 (diff) | |
| download | hdf5-e171b57b999a4d0b6c0b97c8138880056fc4a956.zip hdf5-e171b57b999a4d0b6c0b97c8138880056fc4a956.tar.gz hdf5-e171b57b999a4d0b6c0b97c8138880056fc4a956.tar.bz2 | |
[svn-r19497] Change ExternalProject Dependicies guard to positive match (Windows configure error)
Tested: Windows
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 01462dc..4f3a1f4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -570,7 +570,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) @@ -581,7 +581,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) @@ -614,14 +614,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 |