diff -r Cmake-1.8.5-contrib/c++/CMakeLists.txt Cmake-initial-contrib/c++/CMakeLists.txt 1d0 < cmake_minimum_required (VERSION 2.8) 4a4,18 > # Setup output Directories > #----------------------------------------------------------------------------- > IF(NOT HDF5_EXTERNALLY_CONFIGURED) > SET (CMAKE_RUNTIME_OUTPUT_DIRECTORY > ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all Executables." > ) > SET (CMAKE_LIBRARY_OUTPUT_DIRECTORY > ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all Libraries" > ) > SET (CMAKE_ARCHIVE_OUTPUT_DIRECTORY > ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all static libraries." > ) > ENDIF(NOT HDF5_EXTERNALLY_CONFIGURED) > > #----------------------------------------------------------------------------- 14,16c28,29 < CONFIGURE_FILE (${HDF5_SOURCE_DIR}/Resources/H5cxx_config.h.in < ${HDF5_BINARY_DIR}/H5cxx_pubconf.h < ) --- > CONFIGURE_FILE(${HDF5_SOURCE_DIR}/Resources/H5cxx_config.h.in > ${HDF5_BINARY_DIR}/H5cxx_pubconf.h) 21,23c34,36 < INCLUDE_DIRECTORIES (${HDF5_CPP_SOURCE_DIR}/src) < INCLUDE_DIRECTORIES (${HDF5_BINARY_DIR}) < --- > INCLUDE_DIRECTORIES(${HDF5_CPP_SOURCE_DIR}/src) > INCLUDE_DIRECTORIES(${HDF5_BINARY_DIR}) > 28,29c41,42 < ADD_DEFINITIONS ("-DMPICH_SKIP_MPICXX") < ADD_DEFINITIONS ("-DMPICH_IGNORE_CXX_SEEK") --- > ADD_DEFINITIONS("-DMPICH_SKIP_MPICXX") > ADD_DEFINITIONS("-DMPICH_IGNORE_CXX_SEEK") 32c45,115 < ADD_SUBDIRECTORY (${HDF5_CPP_SOURCE_DIR}/src ${HDF5_CPP_BINARY_DIR}/src) --- > #----------------------------------------------------------------------------- > # Define cpp Library > #----------------------------------------------------------------------------- > SET (CPP_SRCS > ${HDF5_CPP_SOURCE_DIR}/src/H5AbstractDs.cpp > ${HDF5_CPP_SOURCE_DIR}/src/H5ArrayType.cpp > ${HDF5_CPP_SOURCE_DIR}/src/H5AtomType.cpp > ${HDF5_CPP_SOURCE_DIR}/src/H5Attribute.cpp > ${HDF5_CPP_SOURCE_DIR}/src/H5CommonFG.cpp > ${HDF5_CPP_SOURCE_DIR}/src/H5CompType.cpp > ${HDF5_CPP_SOURCE_DIR}/src/H5DataSet.cpp > ${HDF5_CPP_SOURCE_DIR}/src/H5DataSpace.cpp > ${HDF5_CPP_SOURCE_DIR}/src/H5DataType.cpp > ${HDF5_CPP_SOURCE_DIR}/src/H5DcreatProp.cpp > ${HDF5_CPP_SOURCE_DIR}/src/H5DxferProp.cpp > ${HDF5_CPP_SOURCE_DIR}/src/H5EnumType.cpp > ${HDF5_CPP_SOURCE_DIR}/src/H5Exception.cpp > ${HDF5_CPP_SOURCE_DIR}/src/H5FaccProp.cpp > ${HDF5_CPP_SOURCE_DIR}/src/H5FcreatProp.cpp > ${HDF5_CPP_SOURCE_DIR}/src/H5File.cpp > ${HDF5_CPP_SOURCE_DIR}/src/H5FloatType.cpp > ${HDF5_CPP_SOURCE_DIR}/src/H5Group.cpp > ${HDF5_CPP_SOURCE_DIR}/src/H5IdComponent.cpp > ${HDF5_CPP_SOURCE_DIR}/src/H5IntType.cpp > ${HDF5_CPP_SOURCE_DIR}/src/H5Library.cpp > ${HDF5_CPP_SOURCE_DIR}/src/H5Object.cpp > ${HDF5_CPP_SOURCE_DIR}/src/H5PredType.cpp > ${HDF5_CPP_SOURCE_DIR}/src/H5PropList.cpp > ${HDF5_CPP_SOURCE_DIR}/src/H5StrType.cpp > ${HDF5_CPP_SOURCE_DIR}/src/H5VarLenType.cpp > ) > > SET (CPP_HDRS > ${HDF5_CPP_SOURCE_DIR}/src/H5AbstractDs.h > ${HDF5_CPP_SOURCE_DIR}/src/H5Alltypes.h > ${HDF5_CPP_SOURCE_DIR}/src/H5ArrayType.h > ${HDF5_CPP_SOURCE_DIR}/src/H5AtomType.h > ${HDF5_CPP_SOURCE_DIR}/src/H5Attribute.h > ${HDF5_CPP_SOURCE_DIR}/src/H5Classes.h > ${HDF5_CPP_SOURCE_DIR}/src/H5CommonFG.h > ${HDF5_CPP_SOURCE_DIR}/src/H5CompType.h > ${HDF5_CPP_SOURCE_DIR}/src/H5Cpp.h > ${HDF5_CPP_SOURCE_DIR}/src/H5CppDoc.h > ${HDF5_CPP_SOURCE_DIR}/src/H5DataSet.h > ${HDF5_CPP_SOURCE_DIR}/src/H5DataSpace.h > ${HDF5_CPP_SOURCE_DIR}/src/H5DataType.h > ${HDF5_CPP_SOURCE_DIR}/src/H5DcreatProp.h > ${HDF5_CPP_SOURCE_DIR}/src/H5DxferProp.h > ${HDF5_CPP_SOURCE_DIR}/src/H5EnumType.h > ${HDF5_CPP_SOURCE_DIR}/src/H5Exception.h > ${HDF5_CPP_SOURCE_DIR}/src/H5FaccProp.h > ${HDF5_CPP_SOURCE_DIR}/src/H5FcreatProp.h > ${HDF5_CPP_SOURCE_DIR}/src/H5File.h > ${HDF5_CPP_SOURCE_DIR}/src/H5FloatType.h > ${HDF5_CPP_SOURCE_DIR}/src/H5Group.h > ${HDF5_CPP_SOURCE_DIR}/src/H5IdComponent.h > ${HDF5_CPP_SOURCE_DIR}/src/H5Include.h > ${HDF5_CPP_SOURCE_DIR}/src/H5IntType.h > ${HDF5_CPP_SOURCE_DIR}/src/H5Library.h > ${HDF5_CPP_SOURCE_DIR}/src/H5Object.h > ${HDF5_CPP_SOURCE_DIR}/src/H5PredType.h > ${HDF5_CPP_SOURCE_DIR}/src/H5PropList.h > ${HDF5_CPP_SOURCE_DIR}/src/H5StrType.h > ${HDF5_CPP_SOURCE_DIR}/src/H5VarLenType.h > ) > > > ADD_LIBRARY(${HDF5_CPP_LIB_NAME} ${LIB_TYPE} ${CPP_SRCS} ${CPP_HDRS} ) > SET_GLOBAL_VARIABLE(HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_CPP_LIB_NAME}") > TARGET_LINK_LIBRARIES(${HDF5_CPP_LIB_NAME} ${HDF5_LIB_NAME} ) > H5_SET_LIB_OPTIONS(${HDF5_CPP_LIB_NAME} ${HDF5_CPP_LIB_NAME} ${LIB_TYPE} ) 37,39c120,124 < IF (HDF5_BUILD_EXAMPLES) < ADD_SUBDIRECTORY (${HDF5_CPP_SOURCE_DIR}/examples ${HDF5_CPP_BINARY_DIR}/examples) < ENDIF (HDF5_BUILD_EXAMPLES) --- > OPTION (HDF5_BUILD_CPP_EXAMPLES "Build the C++ example programs" OFF) > > IF(HDF5_BUILD_CPP_EXAMPLES) > add_subdirectory(${HDF5_CPP_SOURCE_DIR}/examples ${HDF5_CPP_BINARY_DIR}/examples) > ENDIF(HDF5_BUILD_CPP_EXAMPLES) 45c130 < ADD_SUBDIRECTORY (${HDF5_CPP_SOURCE_DIR}/test ${HDF5_CPP_BINARY_DIR}/test) --- > add_subdirectory(${HDF5_CPP_SOURCE_DIR}/test ${HDF5_CPP_BINARY_DIR}/test) 46a132,154 > > #----------------------------------------------------------------------------- > # Rules for Installation of headers/etc using make Install target > #----------------------------------------------------------------------------- > INSTALL( > FILES > ${CPP_HDRS} > DESTINATION > include/cpp > ) > > #----------------------------------------------------------------------------- > # Add library to CMake Install : Installs lib and cmake config info > #----------------------------------------------------------------------------- > INSTALL( > TARGETS > ${HDF5_CPP_LIB_NAME} > EXPORT > hdf5-targets > LIBRARY DESTINATION lib > ARCHIVE DESTINATION lib > RUNTIME DESTINATION bin > ) diff -r Cmake-1.8.5-contrib/c++/examples/CMakeLists.txt Cmake-initial-contrib/c++/examples/CMakeLists.txt 1,7c1 < cmake_minimum_required (VERSION 2.8) < # -------------------------------------------------------------------- < # Notes: When creating examples they should be prefixed < # with "cpp_ex_". This allows for easier filtering of the examples. < # -------------------------------------------------------------------- < < PROJECT (HDF5_CPP_EXAMPLES) --- > project (HDF5_CPP_EXAMPLES) 10c4 < # Define examples --- > # Setup output Directories 11a6,38 > IF(NOT HDF5_EXTERNALLY_CONFIGURED) > SET (CMAKE_RUNTIME_OUTPUT_DIRECTORY > ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all Executables." > ) > SET (CMAKE_LIBRARY_OUTPUT_DIRECTORY > ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all Libraries" > ) > SET (CMAKE_ARCHIVE_OUTPUT_DIRECTORY > ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all static libraries." > ) > ENDIF(NOT HDF5_EXTERNALLY_CONFIGURED) > > > ADD_EXECUTABLE( cpp_chunks ${HDF5_CPP_EXAMPLES_SOURCE_DIR}/chunks.cpp) > TARGET_LINK_LIBRARIES( cpp_chunks ${HDF5_CPP_LIB_NAME} ${HDF5_LIB_NAME} ) > > ADD_EXECUTABLE( cpp_compound ${HDF5_CPP_EXAMPLES_SOURCE_DIR}/compound.cpp) > TARGET_LINK_LIBRARIES( cpp_compound ${HDF5_CPP_LIB_NAME} ${HDF5_LIB_NAME} ) > > ADD_EXECUTABLE( cpp_create ${HDF5_CPP_EXAMPLES_SOURCE_DIR}/create.cpp) > TARGET_LINK_LIBRARIES( cpp_create ${HDF5_CPP_LIB_NAME} ${HDF5_LIB_NAME} ) > > ADD_EXECUTABLE( cpp_extend_ds ${HDF5_CPP_EXAMPLES_SOURCE_DIR}/extend_ds.cpp) > TARGET_LINK_LIBRARIES( cpp_extend_ds ${HDF5_CPP_LIB_NAME} ${HDF5_LIB_NAME} ) > > ADD_EXECUTABLE( cpp_h5group ${HDF5_CPP_EXAMPLES_SOURCE_DIR}/h5group.cpp) > TARGET_LINK_LIBRARIES( cpp_h5group ${HDF5_CPP_LIB_NAME} ${HDF5_LIB_NAME} ) > > ADD_EXECUTABLE( cpp_readdata ${HDF5_CPP_EXAMPLES_SOURCE_DIR}/readdata.cpp) > TARGET_LINK_LIBRARIES( cpp_readdata ${HDF5_CPP_LIB_NAME} ${HDF5_LIB_NAME} ) > > ADD_EXECUTABLE( cpp_writedata ${HDF5_CPP_EXAMPLES_SOURCE_DIR}/writedata.cpp) > TARGET_LINK_LIBRARIES( cpp_writedata ${HDF5_CPP_LIB_NAME} ${HDF5_LIB_NAME} ) 13,27d39 < SET (examples < create < readdata < writedata < compound < extend_ds < chunks < h5group < ) < < FOREACH (example ${examples}) < ADD_EXECUTABLE (cpp_ex_${example} ${HDF5_CPP_EXAMPLES_SOURCE_DIR}/${example}.cpp) < H5_NAMING (cpp_ex_${example}) < TARGET_LINK_LIBRARIES (cpp_ex_${example} ${HDF5_CPP_LIB_TARGET} ${HDF5_LIB_TARGET}) < ENDFOREACH (example ${examples}) Only in Cmake-1.8.5-contrib/c++/src: CMakeLists.txt diff -r Cmake-1.8.5-contrib/c++/test/CMakeLists.txt Cmake-initial-contrib/c++/test/CMakeLists.txt 1d0 < cmake_minimum_required (VERSION 2.8) 3c2 < # Notes: When creating unit test executables they should be prefixed --- > # Notes: When creating unit test executables they should be prefixed 10c9 < PROJECT (HDF5_CPP_TEST) --- > project (HDF5_CPP_TEST) 13c12 < # Define Sources --- > # Setup output Directories 14a14,25 > IF(NOT HDF5_EXTERNALLY_CONFIGURED) > SET (CMAKE_RUNTIME_OUTPUT_DIRECTORY > ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all Executables." > ) > SET (CMAKE_LIBRARY_OUTPUT_DIRECTORY > ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all Libraries" > ) > SET (CMAKE_ARCHIVE_OUTPUT_DIRECTORY > ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all static libraries." > ) > ENDIF(NOT HDF5_EXTERNALLY_CONFIGURED) > 26d36 < ${HDF5_CPP_TEST_SOURCE_DIR}/dsets.cpp 30,45d39 < #----------------------------------------------------------------------------- < # Generate the H5srcdir_str.h file containing user settings needed by compilation < #----------------------------------------------------------------------------- < SET (srcdir ${CMAKE_CURRENT_SOURCE_DIR}) < CONFIGURE_FILE (${HDF5_CPP_TEST_SOURCE_DIR}/H5srcdir_str.h.in H5srcdir_str.h @ONLY) < INCLUDE_DIRECTORIES (${CMAKE_CURRENT_BINARY_DIR}) < < INCLUDE_DIRECTORIES (${HDF5_TEST_SOURCE_DIR} ) < < ADD_EXECUTABLE (cpp_testhdf5 ${CPP_TEST_SRCS} ) < H5_NAMING (cpp_testhdf5) < TARGET_LINK_LIBRARIES (cpp_testhdf5 < ${HDF5_CPP_LIB_TARGET} < ${HDF5_LIB_TARGET} < ${HDF5_TEST_LIB_TARGET} < ) 47c41,62 < ADD_TEST (NAME cpp_testhdf5 COMMAND $) --- > INCLUDE_DIRECTORIES( ${HDF5_TEST_SOURCE_DIR} ) > > ADD_EXECUTABLE(cpp_testhdf5 ${CPP_TEST_SRCS} ) > TARGET_LINK_LIBRARIES(cpp_testhdf5 > ${HDF5_CPP_LIB_NAME} > ${HDF5_LIB_NAME} > ${HDF5_TEST_LIB_NAME} ) > ADD_TEST(cpp_testhdf5 ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/cpp_testhdf5) > > set(CPP_DSET_TEST_SRCS > ${HDF5_CPP_TEST_SOURCE_DIR}/dsets.cpp > ${HDF5_CPP_TEST_SOURCE_DIR}/h5cpputil.cpp) > > add_executable(cpp_dset ${CPP_DSET_TEST_SRCS}) > target_link_libraries(cpp_dset > ${HDF5_CPP_LIB_NAME} > ${HDF5_LIB_NAME} > ${HDF5_TEST_LIB_NAME} ) > ADD_TEST(cpp_dset ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/cpp_dset) > > > \ No newline at end of file diff -r Cmake-1.8.5-contrib/CMakeLists.txt Cmake-initial-contrib/CMakeLists.txt 1,2c1,2 < cmake_minimum_required (VERSION 2.8) < PROJECT (HDF5 C CXX) --- > PROJECT(HDF5 C CXX) > cmake_minimum_required(VERSION 2.6) 5c5 < # Instructions for use : Normal Build --- > # Instructions for use : 7c7 < # For standard build of HDF5 libraries,tests and tools. --- > # For standard build of HDF5 libraries,tests and tools. 9,10d8 < # Enable/Disable options according to requirements and < # set CMAKE_INSTALL_PREFIX to the required install path. 13,16c11 < #----------------------------------------------------------------------------- < # Instructions for use : Sub-Project Build < # < # To include HDF5 as a sub-project within another project. --- > # To include HDF5 as a sub-project within another project. 19d13 < # 22,23c16,17 < # If unset (because parent project does not support/use the < # INSTALL (EXPORT target...) syntax), then targets are not configured --- > # If unset (because parent project does not support/use the > # INSTALL(EXPORT target...) syntax), then targets are not configured 25,26c19 < # < # HDF5_LIB_DEPENDENCIES : --- > # HDF5_TARGET_DEPENDENCIES : 31,35d23 < # HDF5_EXTERNAL_LIB_PREFIX : < # If the parent project needs to install hdf libraries, but avoid < # name conflicts with system versions, then a prefix may be added < # to ensure that the correct versions configured are used. < # 40,65c28,30 < # # Tell hdf5 that we are manually overriding certain settings < # SET(HDF5_EXTERNALLY_CONFIGURED 1) < # # Avoid duplicating names of installed libraries < # SET(HDF5_EXTERNAL_LIB_PREFIX "vtk") < # # Targets linking to the HDF5 libs need to know their names < # # if they are changed in the sub project, they should be here too < # SET(HDF5_LIB_NAME "vtkhdf5") < # SET(HDF5_HL_LIB_NAME "vtkhdf5_hl") < # SET(HDF5_LIBRARY "${HDF5_LIB_NAME};${HDF5_HL_LIB_NAME}") < # # Export configuration to this export variable < # SET(HDF5_EXPORTED_TARGETS "paraview-targets") < # < # # Setup all necessary overrides for zlib so that HDF5 uses our < # # internally compiled zlib rather than any other version < # IF(HDF5_ENABLE_Z_LIB_SUPPORT) < # # We must tell the main HDF5 library that it depends on our zlib < # SET(HDF5_LIB_DEPENDENCIES vtkzlib) < # # Override the zlib header file < # IF(VTK_USE_SYSTEM_ZLIB) < # SET(H5_ZLIB_HEADER "zlib.h") < # ELSE(VTK_USE_SYSTEM_ZLIB) < # SET(H5_ZLIB_HEADER "vtk_zlib.h") < # # Set vars that FindZlib would have set if used in sub project < # SET(ZLIB_INCLUDE_DIRS "${VTK_ZLIB_INCLUDE_DIRS}") < # SET(ZLIB_LIBRARIES vtkzlib) < # ENDIF(VTK_USE_SYSTEM_ZLIB) --- > # SET(HDF5_EXTERNALLY_CONFIGURED 1) > # IF(HDF5_ENABLE_Z_LIB_SUPPORT) > # SET(HDF5_TARGET_DEPENDENCIES vtkzlib) 67,74c32,33 < # < # # Add the sub project < # ADD_SUBDIRECTORY(Utilities/hdf5-1.8) < # # Add the HDf5 dirs to our include path < # SET(HDF5_INCLUDE_DIR < # ${ParaView_SOURCE_DIR}/Utilities/hdf5-1.8/src < # ${ParaView_BINARY_DIR}/Utilities/hdf5-1.8 < # ${ParaView_SOURCE_DIR}/Utilities/hdf5-1.8/hl/src) --- > # SET(HDF5_EXPORTED_TARGETS) > # ADD_SUBDIRECTORY(Utilities/hdf5-1.8) 83c42 < SET (HDF5_PACKAGE_VERSION 1.8.5) --- > SET (HDF5_PACKAGE_VERSION 1.8.4) 91c50 < # Set the core names of all the libraries --- > # Set the names of all the libraries 93,120c52,82 < SET (HDF5_LIB_CORENAME "hdf5") < SET (HDF5_TEST_LIB_CORENAME "hdf5_test") < SET (HDF5_CPP_LIB_CORENAME "hdf5_cpp") < SET (HDF5_HL_LIB_CORENAME "hdf5_hl") < SET (HDF5_HL_CPP_LIB_CORENAME "hdf5_hl_cpp") < SET (HDF5_TOOLS_LIB_CORENAME "hdf5_tools") < SET (HDF5_F90_LIB_CORENAME "hdf5_fortran") < SET (HDF5_F90_C_LIB_CORENAME "hdf5_f90cstub") < SET (HDF5_F90_TEST_LIB_CORENAME "hdf5_test_fortran") < SET (HDF5_F90_C_TEST_LIB_CORENAME "hdf5_test_f90cstub") < SET (HDF5_HL_F90_LIB_CORENAME "hdf5_hl_fortran") < SET (HDF5_HL_F90_C_LIB_CORENAME "hdf5_hl_f90cstub") < < #----------------------------------------------------------------------------- < # Set the true names of all the libraries if customized by external project < #----------------------------------------------------------------------------- < SET (HDF5_LIB_NAME "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_LIB_CORENAME}") < SET (HDF5_TEST_LIB_NAME "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_TEST_LIB_CORENAME}") < SET (HDF5_CPP_LIB_NAME "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_CPP_LIB_CORENAME}") < SET (HDF5_HL_LIB_NAME "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_HL_LIB_CORENAME}") < SET (HDF5_HL_CPP_LIB_NAME "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_HL_CPP_LIB_CORENAME}") < SET (HDF5_TOOLS_LIB_NAME "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_TOOLS_LIB_CORENAME}") < SET (HDF5_F90_LIB_NAME "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_F90_LIB_CORENAME}") < SET (HDF5_F90_C_LIB_NAME "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_F90_C_LIB_CORENAME}") < SET (HDF5_F90_TEST_LIB_NAME "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_F90_TEST_LIB_CORENAME}") < SET (HDF5_F90_C_TEST_LIB_NAME "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_F90_C_TEST_LIB_CORENAME}") < SET (HDF5_HL_F90_LIB_NAME "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_HL_F90_LIB_CORENAME}") < SET (HDF5_HL_F90_C_LIB_NAME "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_HL_F90_C_LIB_CORENAME}") --- > SET (HDF5_LIB_NAME "hdf5") > SET (HDF5_TEST_LIB_NAME "h5test") > SET (HDF5_CPP_LIB_NAME "hdf5_cpp") > SET (HDF5_HL_LIB_NAME "hdf5_hl") > SET (HDF5_HL_CPP_LIB_NAME "hdf5_hl_cpp") > SET (HDF5_TOOLS_LIB_NAME "h5tools") > SET (HDF5_F90_LIB_NAME "hdf5_fortran") > SET (HDF5_F90_C_LIB_NAME "hdf5_f90CStub") > SET (HDF5_F90_C_TEST_LIB_NAME "hdf5_f90Ctest") > SET (HDF5_HL_F90_LIB_NAME "hdf5_hl_fortran") > SET (HDF5_HL_F90_C_LIB_NAME "hdf5_hl_f90CStub") > > #----------------------------------------------------------------------------- > # Setup output Directories > #----------------------------------------------------------------------------- > IF(NOT HDF5_EXTERNALLY_CONFIGURED) > SET (CMAKE_RUNTIME_OUTPUT_DIRECTORY > ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all Executables." > ) > SET (CMAKE_LIBRARY_OUTPUT_DIRECTORY > ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all Libraries" > ) > SET (CMAKE_ARCHIVE_OUTPUT_DIRECTORY > ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all static libraries." > ) > ELSE (NOT HDF5_EXTERNALLY_CONFIGURED) > # Older cmake scripts don't set this up so use the default location > IF (NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY) > SET (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}) > ENDIF (NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY) > ENDIF(NOT HDF5_EXTERNALLY_CONFIGURED) 129c91 < SET (HDF5_CPP_TEST_DIR ${HDF5_CPP_SOURCE_DIR}/test) --- > SET (HDF5_CPP_TEST_DIR ${HDF5_CPPLib_DIR}/test) 133d94 < SET (HDF5_F90_SOURCE_DIR ${HDF5_SOURCE_DIR}/fortran) 138,162c99 < INCLUDE (${HDF5_RESOURCES_DIR}/HDF5Macros.cmake) < < #----------------------------------------------------------------------------- < # Setup output Directories < #----------------------------------------------------------------------------- < IF (NOT HDF5_EXTERNALLY_CONFIGURED) < SET (CMAKE_RUNTIME_OUTPUT_DIRECTORY < ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all Executables." < ) < SET (CMAKE_LIBRARY_OUTPUT_DIRECTORY < ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all Libraries" < ) < SET (CMAKE_ARCHIVE_OUTPUT_DIRECTORY < ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all static libraries." < ) < SET (CMAKE_Fortran_MODULE_DIRECTORY < ${PROJECT_BINARY_DIR}/bin/fortran CACHE PATH "Single Directory for all fortran modules." < ) < ELSE (NOT HDF5_EXTERNALLY_CONFIGURED) < # if we are externally configured, but the project uses old cmake scripts < # this may not be set and utilities like H5detect will fail < IF (NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY) < SET (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}) < ENDIF (NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY) < ENDIF(NOT HDF5_EXTERNALLY_CONFIGURED) --- > INCLUDE(${HDF5_RESOURCES_DIR}/HDF5Macros.cmake) 166c103,104 < # by other projects using FindHDF5. --- > # by other projects using FindHDF5. If hdf5 is configured as a sub-project > # then we do not override the setting provided by the parent project 168,170c106,108 < IF (NOT HDF5_EXPORTED_TARGETS) < SET (HDF5_EXPORTED_TARGETS "hdf5-targets") < ENDIF (NOT HDF5_EXPORTED_TARGETS) --- > IF (NOT HDF5_EXTERNALLY_CONFIGURED) > SET(HDF5_EXPORTED_TARGETS "hdf5-targets") > ENDIF (NOT HDF5_EXTERNALLY_CONFIGURED) 173c111 < # To include a library in the list exported by the project AT BUILD TIME, --- > # To include a library in the list exported by the project AT BUILD TIME, 180c118 < # Run all the CMake configuration tests for our build environment --- > # Setup output Directories 182c120,130 < INCLUDE (${HDF5_SOURCE_DIR}/ConfigureChecks.cmake) --- > IF(NOT HDF5_EXTERNALLY_CONFIGURED) > SET (CMAKE_RUNTIME_OUTPUT_DIRECTORY > ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all Executables." > ) > SET (CMAKE_LIBRARY_OUTPUT_DIRECTORY > ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all Libraries" > ) > SET (CMAKE_ARCHIVE_OUTPUT_DIRECTORY > ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all static libraries." > ) > ENDIF(NOT HDF5_EXTERNALLY_CONFIGURED) 185c133 < # Option to use legacy naming for windows libs/programs, default is legacy --- > # Run all the CMake configuration tests for our build environment 187,189c135 < IF (WIN32) < OPTION (H5_LEGACY_NAMING "Use Legacy Names for Libraries and Programs" ON) < ENDIF (WIN32) --- > INCLUDE(${HDF5_SOURCE_DIR}/ConfigureChecks.cmake) 198,212c144,145 < SET (H5_BUILT_AS_DYNAMIC_LIB 1) < SET (LIBPOSTFIX "") < IF (MSVC) < SET (CMAKE_MFC_FLAG 0) < FOREACH (flag_var < CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE < CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO < CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE < CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO) < IF (${flag_var} MATCHES "/MT") < STRING (REGEX REPLACE "/MT" "/MD" ${flag_var} "${${flag_var}}") < ENDIF (${flag_var} MATCHES "/MT") < ENDFOREACH (flag_var) < ENDIF (MSVC) < ELSE (BUILD_SHARED_LIBS) --- > SET (H5_BUILT_AS_DYNAMIC_LIB 1) > ELSE(NOT WIN32) 217,229d149 < SET (LIBPOSTFIX "") < IF (MSVC) < SET (CMAKE_MFC_FLAG 0) < FOREACH (flag_var < CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE < CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO < CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE < CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO) < IF (${flag_var} MATCHES "/MD") < STRING (REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}") < ENDIF (${flag_var} MATCHES "/MD") < ENDFOREACH (flag_var) < ENDIF (MSVC) 233,248d152 < # Set the target names of all the libraries < #----------------------------------------------------------------------------- < SET (HDF5_LIB_TARGET ${HDF5_LIB_NAME}${LIBPOSTFIX}) < SET (HDF5_TEST_LIB_TARGET ${HDF5_TEST_LIB_NAME}${LIBPOSTFIX}) < SET (HDF5_CPP_LIB_TARGET ${HDF5_CPP_LIB_NAME}${LIBPOSTFIX}) < SET (HDF5_HL_LIB_TARGET ${HDF5_HL_LIB_NAME}${LIBPOSTFIX}) < SET (HDF5_HL_CPP_LIB_TARGET ${HDF5_HL_CPP_LIB_NAME}${LIBPOSTFIX}) < SET (HDF5_TOOLS_LIB_TARGET ${HDF5_TOOLS_LIB_NAME}${LIBPOSTFIX}) < SET (HDF5_F90_LIB_TARGET ${HDF5_F90_LIB_NAME}${LIBPOSTFIX}) < SET (HDF5_F90_C_LIB_TARGET ${HDF5_F90_C_LIB_NAME}${LIBPOSTFIX}) < SET (HDF5_F90_TEST_LIB_TARGET ${HDF5_F90_TEST_LIB_NAME}${LIBPOSTFIX}) < SET (HDF5_F90_C_TEST_LIB_TARGET ${HDF5_F90_C_TEST_LIB_NAME}${LIBPOSTFIX}) < SET (HDF5_HL_F90_LIB_TARGET ${HDF5_HL_F90_LIB_NAME}${LIBPOSTFIX}) < SET (HDF5_HL_F90_C_LIB_TARGET ${HDF5_HL_F90_C_LIB_NAME}${LIBPOSTFIX}) < < #----------------------------------------------------------------------------- 252,254c156,158 < ${HDF5_SRC_DIR} < ${HDF5_SOURCE_DIR} < ${HDF5_BINARY_DIR} --- > ${HDF5_SRC_DIR} > ${HDF5_SOURCE_DIR} > ${HDF5_BINARY_DIR} 256,279c160 < INCLUDE_DIRECTORIES (${HDF5_INCLUDE_DIRECTORIES}) < < #----------------------------------------------------------------------------- < # When building utility executables that generate other (source) files : < # we make use of the following variables defined in the root CMakeLists. < # Certain systems may add /Debug or /Release to output paths < # and we need to call the executable from inside the CMake configuration < #----------------------------------------------------------------------------- < SET (EXE_EXT "") < IF (WIN32) < SET (EXE_EXT ".exe") < ADD_DEFINITIONS (-DBIND_TO_CURRENT_VCLIBS_VERSION=1) < ADD_DEFINITIONS (-D_CRT_SECURE_NO_WARNINGS) < ENDIF (WIN32) < < SET (MAKE_SYSTEM) < IF (CMAKE_BUILD_TOOL MATCHES "make") < SET (MAKE_SYSTEM 1) < ENDIF (CMAKE_BUILD_TOOL MATCHES "make") < < SET (CFG_INIT "/${CMAKE_CFG_INTDIR}") < IF (MAKE_SYSTEM) < SET (CFG_INIT "") < ENDIF (MAKE_SYSTEM) --- > INCLUDE_DIRECTORIES( ${HDF5_INCLUDE_DIRECTORIES} ) 284,290c165,171 < IF (CMAKE_BUILD_TYPE MATCHES Debug) < ADD_DEFINITIONS (-DDEBUG) < ADD_DEFINITIONS ( < -DH5_DEBUG_API -DH5Z_DEBUG -DH5V_DEBUG -DH5T_DEBUG < -DH5S_DEBUG -DH5P_DEBUG -DH5O_DEBUG -DH5MM_DEBUG -DH5MF_DEBUG < -DH5I_DEBUG -DH5HL_DEBUG -DH5HG_DEBUG -DH5G_DEBUG -DH5F_DEBUG < -DH5E_DEBUG -DH5D_DEBUG -DH5B_DEBUG -DH5AC_DEBUG -UNDEBUG --- > IF ( CMAKE_BUILD_TYPE MATCHES Debug ) > ADD_DEFINITIONS(-DDEBUG) > ADD_DEFINITIONS( > -DH5_DEBUG_API -DH5Z_DEBUG -DH5V_DEBUG -DH5T_DEBUG > -DH5S_DEBUG -DH5P_DEBUG -DH5O_DEBUG -DH5MM_DEBUG -DH5MF_DEBUG > -DH5I_DEBUG -DH5HL_DEBUG -DH5HG_DEBUG -DH5G_DEBUG -DH5F_DEBUG > -DH5E_DEBUG -DH5D_DEBUG -DH5B_DEBUG -DH5AC_DEBUG -UNDEBUG 293,295c174,176 < IF (NOT WIN32) < ADD_DEFINITIONS (-Wall) < ENDIF (NOT WIN32) --- > if (NOT WIN32) > ADD_DEFINITIONS(-Wall) > endif() 297,298c178,179 < ADD_DEFINITIONS (-UH5_DEBUG_API -DNDEBUG) < ENDIF (CMAKE_BUILD_TYPE MATCHES Debug) --- > ADD_DEFINITIONS(-UH5_DEBUG_API -DNDEBUG) > ENDIF ( CMAKE_BUILD_TYPE MATCHES Debug ) 304c185 < SET (CMAKE_C_FLAGS "${CMAKE_ANSI_CFLAGS} ${CMAKE_C_FLAGS} -std=c99 -fomit-frame-pointer -finline-functions -fno-common") --- > SET (CMAKE_C_FLAGS "${CMAKE_ANSI_CFLAGS} ${CMAKE_C_FLAGS} -std=c99 -fomit-frame-pointer -finline-functions -fno-common") 316,317c197,198 < STRING (REGEX REPLACE "(^| )([/-])W[0-9]( |$)" " " < CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") --- > STRING(REGEX REPLACE "(^| )([/-])W[0-9]( |$)" " " > CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") 321,322c202,203 < ADD_DEFINITIONS (-D_CRT_SECURE_NO_WARNINGS) < ENDIF(WIN32) --- > add_definitions(-D_CRT_SECURE_NO_WARNINGS) > ENDIF() 336,337c217,218 < # This is in here to help some of the GCC based IDES like Eclipse < # and code blocks parse the compiler errors and warnings better. --- > # This is in here to help some of the GCC based IDES like Eclipse > # and code blocks parse the compiler errors and warnings better. 347c228 < # Option to Enable MPI Parallel --- > # Option to Enable MPI Parallel 349,352c230,233 < OPTION (HDF5_ENABLE_PARALLEL "Enable parallel build (requires MPI)" OFF) < IF (HDF5_ENABLE_PARALLEL) < INCLUDE (FindMPI) < INCLUDE_DIRECTORIES (${MPI_INCLUDE_PATH}) --- > OPTION(HDF5_ENABLE_PARALLEL "Enable parallel build (requires MPI)" OFF) > IF (HDF5_ENABLE_PARALLEL) > INCLUDE(FindMPI) > INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH}) 355,362d235 < # MPI checks, only do these if MPI_FOUND is true, otherwise they always fail < # and once set, they are cached as false and not regenerated < SET (CMAKE_REQUIRED_INCLUDES "${MPI_INCLUDE_PATH}/mpi.h" ) < SET (CMAKE_REQUIRED_LIBRARIES "${MPI_LIBRARY}" ) < CHECK_FUNCTION_EXISTS (MPI_File_get_size H5_HAVE_MPI_GET_SIZE) < # Used by Fortran + MPI < CHECK_SYMBOL_EXISTS (MPI_Comm_c2f "${MPI_INCLUDE_PATH}/mpi.h" H5_HAVE_MPI_MULTI_LANG_Comm) < CHECK_SYMBOL_EXISTS (MPI_Info_c2f "${MPI_INCLUDE_PATH}/mpi.h" H5_HAVE_MPI_MULTI_LANG_Info) 364c237 < ENDIF (HDF5_ENABLE_PARALLEL) --- > ENDIF (HDF5_ENABLE_PARALLEL) 370c243 < SET (CMAKE_EXE_LINKER_FLAGS ${MPI_LINK_FLAGS} ${CMAKE_EXE_LINKER_FLAGS}) --- > SET(CMAKE_EXE_LINKER_FLAGS ${MPI_LINK_FLAGS} ${CMAKE_EXE_LINKER_FLAGS}) 372c245 < IF (MPI_EXTRA_LIBRARY) --- > IF (MPI_EXTRA_LIBRARY) 374c247 < ENDIF (MPI_EXTRA_LIBRARY) --- > ENDIF (MPI_EXTRA_LIBRARY) 380c253 < OPTION (HDF5_USE_16_API_DEFAULT "Use the HDF5 1.6.x API by default" OFF) --- > OPTION(HDF5_USE_16_API_DEFAULT "Use the HDF5 1.6.x API by default" OFF) 382c255 < IF (HDF5_USE_16_API_DEFAULT) --- > IF (HDF5_USE_16_API_DEFAULT) 384c257 < ENDIF (HDF5_USE_16_API_DEFAULT) --- > ENDIF (HDF5_USE_16_API_DEFAULT) 389,391c262,264 < MACRO (HDF5_SETUP_FILTERS FILTER) < OPTION (HDF5_USE_FILTER_${FILTER} "Use the ${FILTER} Filter" ON) < IF (HDF5_USE_FILTER_${FILTER}) --- > macro(HDF5_SETUP_FILTERS FILTER) > option (HDF5_USE_FILTER_${FILTER} "Use the ${FILTER} Filter" ON) > if ( HDF5_USE_FILTER_${FILTER} ) 393,400c266,273 < ENDIF (HDF5_USE_FILTER_${FILTER}) < # MESSAGE (STATUS "Filter ${FILTER} is ${HDF5_USE_FILTER_${FILTER}}") < ENDMACRO (HDF5_SETUP_FILTERS) < < HDF5_SETUP_FILTERS (SHUFFLE) < HDF5_SETUP_FILTERS (FLETCHER32) < HDF5_SETUP_FILTERS (NBIT) < HDF5_SETUP_FILTERS (SCALEOFFSET) --- > endif() > # message(STATUS "Filter ${FILTER} is ${HDF5_USE_FILTER_${FILTER}}") > endmacro() > > HDF5_SETUP_FILTERS( SHUFFLE ) > HDF5_SETUP_FILTERS( FLETCHER32 ) > HDF5_SETUP_FILTERS( NBIT ) > HDF5_SETUP_FILTERS( SCALEOFFSET ) 405c278 < OPTION (HDF5_ENABLE_Z_LIB_SUPPORT "Enable Zlib Filters" OFF) --- > OPTION(HDF5_ENABLE_Z_LIB_SUPPORT "Enable Zlib Filters" OFF) 408c281 < FIND_PACKAGE (ZLIB REQUIRED) --- > FIND_PACKAGE(ZLIB REQUIRED) 412d284 < SET (H5_HAVE_LIBZ 1) 415c287 < MESSAGE (FATAL " ZLib is Required for ZLib support in HDF5") --- > MESSAGE(FATAL " ZLib is Required for ZLib support in HDF5") 421d292 < SET (H5_HAVE_LIBZ 1) 423,426c294,298 < CONFIGURE_FILE (${HDF5_SOURCE_DIR}/Resources/hdf5_zlib.h.in ${HDF5_BINARY_DIR}/hdf5_zlib.h @ONLY) < SET (LINK_LIBS ${LINK_LIBS} ${ZLIB_LIBRARIES}) < INCLUDE_DIRECTORIES (${ZLIB_INCLUDE_DIRS}) < MESSAGE (STATUS "Filter ZLIB is ON") --- > CONFIGURE_FILE(${HDF5_SOURCE_DIR}/Resources/hdf5_zlib.h.in > ${HDF5_BINARY_DIR}/hdf5_zlib.h @ONLY IMMEDIATE) > SET (LINK_LIBS ${LINK_LIBS} ${ZLIB_LIBRARIES} ) > include_directories(${ZLIB_INCLUDE_DIRS}) > message(STATUS "Filter ZLIB is ON") 430c302 < # Option for SzLib support --- > # Option for SLib support 433c305 < OPTION (HDF5_ENABLE_SZIP_SUPPORT "Use SZip Filter" OFF) --- > OPTION(HDF5_ENABLE_SZIP_SUPPORT "Use SZip Filter" OFF) 435,436c307,308 < FIND_PACKAGE (SZIP REQUIRED) < IF (SZIP_FOUND) --- > find_package(SZIP REQUIRED) > if (SZIP_FOUND) 439,461c311,319 < SET (H5_HAVE_LIBSZ 1) < SET (LINK_LIBS ${LINK_LIBS} ${SZIP_LIBRARIES}) < INCLUDE_DIRECTORIES (${SZIP_INCLUDE_DIRS}) < # MESSAGE (STATUS "SZIP_INCLUDE_DIRS: ${SZIP_INCLUDE_DIRS}") < # MESSAGE (STATUS "SZIP_INCLUDE_DIR: ${SZIP_INCLUDE_DIR}") < MESSAGE (STATUS "Filter SZIP is ON") < OPTION (HDF5_ENABLE_SZIP_ENCODING "Use SZip Encoding" OFF) < IF (HDF5_ENABLE_SZIP_ENCODING) < SET (H5_HAVE_SZIP_ENCODER 1) < ENDIF (HDF5_ENABLE_SZIP_ENCODING) < ELSE (SZIP_FOUND) < MESSAGE (FATAL_ERROR "SZIP is Required for SZIP support in HDF5") < ENDIF (SZIP_FOUND) < ENDIF (HDF5_ENABLE_SZIP_SUPPORT) < < #----------------------------------------------------------------------------- < # Option to use PACKED BITS SUPPORT < #----------------------------------------------------------------------------- < OPTION (HDF5_USE_H5DUMP_PACKED_BITS "Use the PACKED BITS feature in h5dump" ON) < SET (H5_HAVE_H5DUMP_PACKED_BITS 0) < IF (HDF5_USE_H5DUMP_PACKED_BITS) < SET (H5_HAVE_H5DUMP_PACKED_BITS 1) < ENDIF (HDF5_USE_H5DUMP_PACKED_BITS) --- > SET (LINK_LIBS ${LINK_LIBS} ${SZIP_LIBRARIES} ) > include_directories(${SZIP_INCLUDE_DIRS}) > # message(STATUS "SZIP_INCLUDE_DIRS: ${SZIP_INCLUDE_DIRS}") > # message(STATUS "SZIP_INCLUDE_DIR: ${SZIP_INCLUDE_DIR}") > message(STATUS "Filter SZIP is ON") > else() > MESSAGE(FATAL_ERROR "SZIP is Required for SZIP support in HDF5") > endif() > ENDIF () 464c322 < # Add the HDF5 Library Target to the build --- > # Define the list of source files for the main hdf5 library 466c324 < ADD_SUBDIRECTORY (${HDF5_SOURCE_DIR}/src ${PROJECT_BINARY_DIR}/src) --- > INCLUDE(${HDF5_SOURCE_DIR}/LibSources.cmake) 469c327,328 < # Build utility to copy and strip X lines of file --- > # Setup the H5Detect utility which generates H5Tinit with platform > # specific type checks inside 471,474c330,356 < IF (HDF5_BUILD_TOOLS AND BUILD_TESTING) < SET (XLATE_UTILITY "xlatefile") < ADD_EXECUTABLE(${XLATE_UTILITY} ${HDF5_SOURCE_DIR}/Resources/xlatefile.c) < ENDIF (HDF5_BUILD_TOOLS AND BUILD_TESTING) --- > SET (EXE_EXT "") > IF (WIN32) > SET (EXE_EXT ".exe") > ENDIF (WIN32) > > SET (MAKE_SYSTEM) > IF (CMAKE_BUILD_TOOL MATCHES "make") > SET (MAKE_SYSTEM 1) > ENDIF (CMAKE_BUILD_TOOL MATCHES "make") > > SET (CFG_INIT "/${CMAKE_CFG_INTDIR}") > IF (MAKE_SYSTEM) > SET (CFG_INIT "") > ENDIF (MAKE_SYSTEM) > > SET (CMD ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}${CFG_INIT}/H5detect${EXE_EXT}) > IF(XCODE) > SET (CMD "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/\${CONFIGURATION}/H5detect") > ENDIF(XCODE) > ADD_EXECUTABLE(H5detect ${HDF5_SRC_DIR}/H5detect.c) > > ADD_CUSTOM_COMMAND( > OUTPUT ${HDF5_BINARY_DIR}/H5Tinit.c > COMMAND ${CMD} > ARGS > ${HDF5_BINARY_DIR}/H5Tinit.c > DEPENDS H5detect > ) 477c359 < # Dashboard and Testing Settings --- > # Add H5Tinit source to build - generated by H5Detect/CMake at configure time 479,491c361,362 < OPTION (BUILD_TESTING "Build HDF5 Unit Testing" OFF) < IF (BUILD_TESTING) < SET (DART_TESTING_TIMEOUT 1200 CACHE INTEGER < "Timeout in seconds for each test (default 1200=20minutes)") < ENABLE_TESTING () < INCLUDE (CTest) < IF (NOT HDF5_EXTERNALLY_CONFIGURED) < ADD_SUBDIRECTORY (${HDF5_SOURCE_DIR}/tools/lib ${PROJECT_BINARY_DIR}/tools/lib) < ADD_SUBDIRECTORY (${HDF5_SOURCE_DIR}/test ${PROJECT_BINARY_DIR}/test) < ADD_SUBDIRECTORY (${HDF5_SOURCE_DIR}/perform ${PROJECT_BINARY_DIR}/perform) < ENDIF (NOT HDF5_EXTERNALLY_CONFIGURED) < INCLUDE (${HDF5_SOURCE_DIR}/CTestConfig.cmake) < ENDIF (BUILD_TESTING) --- > SET (common_SRCS ${common_SRCS} ${HDF5_BINARY_DIR}/H5Tinit.c) > SET_SOURCE_FILES_PROPERTIES (${HDF5_BINARY_DIR}/H5Tinit.c GENERATED) 494,496c365 < # Option to build Fortran bindings/tests/examples < # Make sure this appears before the CONFIGURE_FILE step < # so that fortran name mangling is detected before writing H5pubconf.h --- > # Add the HDF5 Library Target to the build 498,507c367,370 < OPTION (HDF5_BUILD_FORTRAN "Build FORTRAN support" OFF) < IF (HDF5_BUILD_FORTRAN) < # Set default name mangling : overridden by Fortran detection in fortran dir < SET (H5_FC_FUNC "H5_FC_FUNC(name,NAME) name ## _") < SET (H5_FC_FUNC_ "H5_FC_FUNC_(name,NAME) name ## _") < ADD_SUBDIRECTORY (${HDF5_SOURCE_DIR}/fortran ${PROJECT_BINARY_DIR}/fortran) < ELSE (HDF5_BUILD_FORTRAN) < SET (H5_FC_FUNC "H5_FC_FUNC(name,NAME) name ## _") < SET (H5_FC_FUNC_ "H5_FC_FUNC_(name,NAME) name ## _") < ENDIF (HDF5_BUILD_FORTRAN) --- > ADD_LIBRARY(${HDF5_LIB_NAME} ${common_SRCS} ${H5_PUBLIC_HEADERS} ${H5_PRIVATE_HEADERS}) > SET_GLOBAL_VARIABLE(HDF5_LIBRARIES_TO_EXPORT ${HDF5_LIB_NAME}) > TARGET_LINK_LIBRARIES(${HDF5_LIB_NAME} ${LINK_LIBS}) > H5_SET_LIB_OPTIONS(${HDF5_LIB_NAME} ${HDF5_LIB_NAME} ${LIB_TYPE}) 510,515c373,387 < # Option to build examples < #----------------------------------------------------------------------------- < OPTION (HDF5_BUILD_EXAMPLES "Build HDF5 Library Examples" OFF) < IF (HDF5_BUILD_EXAMPLES) < ADD_SUBDIRECTORY (${HDF5_SOURCE_DIR}/examples ${PROJECT_BINARY_DIR}/examples) < ENDIF (HDF5_BUILD_EXAMPLES) --- > # Dashboard and Testing Settings > #----------------------------------------------------------------------------- > OPTION(BUILD_TESTING "Build HDF5 Unit Testing" OFF) > IF (BUILD_TESTING) > SET (DART_TESTING_TIMEOUT 1200 CACHE INTEGER > "Timeout in seconds for each test (default 1200=20minutes)") > ENABLE_TESTING() > INCLUDE(CTest) > IF(NOT HDF5_EXTERNALLY_CONFIGURED) > ADD_SUBDIRECTORY(${HDF5_SOURCE_DIR}/tools/lib ${PROJECT_BINARY_DIR}/tools/lib) > ADD_SUBDIRECTORY(${HDF5_SOURCE_DIR}/test ${PROJECT_BINARY_DIR}/test) > ADD_SUBDIRECTORY(${HDF5_SOURCE_DIR}/perform ${PROJECT_BINARY_DIR}/perform) > ENDIF(NOT HDF5_EXTERNALLY_CONFIGURED) > include (${HDF5_SOURCE_DIR}/CTestConfig.cmake) > ENDIF ( BUILD_TESTING ) 520c392 < OPTION (HDF5_BUILD_CPP_LIB "Build HDF5 C++ Library" OFF) --- > OPTION(HDF5_BUILD_CPP_LIB "Build HDF5 C++ Library" OFF) 522,523c394,395 < ADD_SUBDIRECTORY (${HDF5_SOURCE_DIR}/c++ ${PROJECT_BINARY_DIR}/c++) < ENDIF (HDF5_BUILD_CPP_LIB) --- > ADD_SUBDIRECTORY(${HDF5_SOURCE_DIR}/c++ ${PROJECT_BINARY_DIR}/c++) > ENDIF ( HDF5_BUILD_CPP_LIB ) 528c400 < OPTION (HDF5_BUILD_TOOLS "Build HDF5 Tools" OFF) --- > OPTION(HDF5_BUILD_TOOLS "Build HDF5 Tools" OFF) 530,531c402,403 < ADD_SUBDIRECTORY (${HDF5_SOURCE_DIR}/tools ${PROJECT_BINARY_DIR}/tools) < ENDIF (HDF5_BUILD_TOOLS) --- > ADD_SUBDIRECTORY(${HDF5_SOURCE_DIR}/tools ${PROJECT_BINARY_DIR}/tools) > ENDIF ( HDF5_BUILD_TOOLS ) 536c408 < OPTION (HDF5_BUILD_HL_LIB "Build HIGH Level HDF5 Library" OFF) --- > OPTION(HDF5_BUILD_HL_LIB "Build HIGH Level HDF5 Library" OFF) 538,540c410,427 < SET (H5_INCLUDE_HL 1) < ADD_SUBDIRECTORY (${HDF5_SOURCE_DIR}/hl ${PROJECT_BINARY_DIR}/hl) < ENDIF (HDF5_BUILD_HL_LIB) --- > ADD_SUBDIRECTORY(${HDF5_SOURCE_DIR}/hl ${PROJECT_BINARY_DIR}/hl) > ENDIF ( HDF5_BUILD_HL_LIB ) > > #----------------------------------------------------------------------------- > # Option to build Fortran bindings/tests/examples > # Make sure this appears before the CONFIGURE_FILE step > # so that fortran name mangling is detected before writing H5pubconf.h > #----------------------------------------------------------------------------- > OPTION(HDF5_BUILD_FORTRAN "Build FORTRAN support" OFF) > IF (HDF5_BUILD_FORTRAN) > # Set default name mangling : overridden by Fortran detection in fortran dir > SET(H5_FC_FUNC "H5_FC_FUNC(name,NAME) NAME") > SET(H5_FC_FUNC_ "H5_FC_FUNC_(name,NAME) NAME") > ADD_SUBDIRECTORY(${HDF5_SOURCE_DIR}/fortran ${PROJECT_BINARY_DIR}/fortran) > ELSE ( HDF5_BUILD_FORTRAN ) > SET(H5_FC_FUNC "H5_FC_FUNC(name,NAME) NAME") > SET(H5_FC_FUNC_ "H5_FC_FUNC_(name,NAME) NAME") > ENDIF ( HDF5_BUILD_FORTRAN ) 545c432,433 < CONFIGURE_FILE (${HDF5_SOURCE_DIR}/Resources/H5pubconf.h.in ${HDF5_BINARY_DIR}/H5pubconf.h @ONLY) --- > CONFIGURE_FILE(${HDF5_SOURCE_DIR}/Resources/H5pubconf.h.in > ${HDF5_BINARY_DIR}/H5pubconf.h @ONLY IMMEDIATE) 548c436 < # Add file(s) to CMake Install --- > # Rules for Installation using make Install target 551,554c439,444 < FILES < ${PROJECT_BINARY_DIR}/H5pubconf.h < DESTINATION < include --- > FILES > ${PROJECT_BINARY_DIR}/H5pubconf.h > ${H5_PUBLIC_HEADERS} > ${H5_PRIVATE_HEADERS} > DESTINATION > include 558c448 < # Add Target(s) to CMake Install for import into other projects --- > # Add library to CMake Install : Installs lib and cmake config info 560,561c450,454 < INSTALL ( < EXPORT --- > IF (HDF5_EXPORTED_TARGETS) > INSTALL( > TARGETS > ${HDF5_LIB_NAME} > EXPORT 563,573c456,458 < DESTINATION < lib < FILE < HDF5-config.cmake < ) < < # The install rule below copies compiled module files to the install location < # using a "code" rule. The code string should not be broken up, it must be on one line < IF (HDF5_BUILD_FORTRAN) < INSTALL ( CODE < "EXECUTE_PROCESS (COMMAND \"${CMAKE_COMMAND}\" -E copy_directory \"${CMAKE_Fortran_MODULE_DIRECTORY}/\${BUILD_TYPE}\" \"${CMAKE_INSTALL_PREFIX}/fortran\")" --- > LIBRARY DESTINATION lib > ARCHIVE DESTINATION lib > RUNTIME DESTINATION bin 575c460 < ENDIF (HDF5_BUILD_FORTRAN) --- > ENDIF (HDF5_EXPORTED_TARGETS) 577a463,476 > # Export Compilation Targets via Make Install to final location > #----------------------------------------------------------------------------- > IF (HDF5_EXPORTED_TARGETS) > INSTALL( > EXPORT > ${HDF5_EXPORTED_TARGETS} > DESTINATION > lib > FILE > HDF5-config.cmake > ) > ENDIF (HDF5_EXPORTED_TARGETS) > > #----------------------------------------------------------------------------- 580,584c479,483 < EXPORT ( < TARGETS < ${HDF5_LIBRARIES_TO_EXPORT} ${HDF5_LIB_DEPENDENCIES} < FILE < HDF5-config.cmake --- > EXPORT( > TARGETS > ${HDF5_LIBRARIES_TO_EXPORT} ${HDF5_TARGET_DEPENDENCIES} > FILE > HDF5-config.cmake diff -r Cmake-1.8.5-contrib/ConfigureChecks.cmake Cmake-initial-contrib/ConfigureChecks.cmake 13,14c13,14 < MESSAGE (STATUS "Configure Checks that still need to be implemented") < MESSAGE (STATUS " GetConsoleScreenBufferInfo function for Windows") --- > MESSAGE(STATUS "Configure Checks that still need to be implemented") > MESSAGE(STATUS " GetConsoleScreenBufferInfo function for Windows") 20,21c20,21 < SET (H5_AC_APPLE_UNIVERSAL_BUILD 1) < ENDIF (APPLE) --- > SET(H5_AC_APPLE_UNIVERSAL_BUILD 1) > ENDIF() 34,36c34,36 < IF (CMAKE_BUILD_TYPE MATCHES Debug) < SET (HDF5_Enable_Instrument ON) < ENDIF (CMAKE_BUILD_TYPE MATCHES Debug) --- > IF ( CMAKE_BUILD_TYPE MATCHES Debug ) > SET (HDF5_Enable_Instrument ON) > ENDIF ( CMAKE_BUILD_TYPE MATCHES Debug ) 38c38 < IF (HDF5_Enable_Instrument) --- > IF ( HDF5_Enable_Instrument ) 40c40 < ENDIF (HDF5_Enable_Instrument) --- > ENDIF ( HDF5_Enable_Instrument ) 46,48c46,48 < IF (HDF5_STRICT_FORMAT_CHECKS) < SET (H5_STRICT_FORMAT_CHECKS 1) < ENDIF (HDF5_STRICT_FORMAT_CHECKS) --- > IF ( HDF5_STRICT_FORMAT_CHECKS ) > SET (H5_STRICT_FORMAT_CHECKS 1) > ENDIF ( HDF5_STRICT_FORMAT_CHECKS ) 52,53c52,53 < #----------------------------------------------------------------------------- < OPTION (HDF5_METADATA_TRACE_FILE "Enable metadata trace file collection" OFF) --- > #----------------------------------------------------------------------------- > option(HDF5_METADATA_TRACE_FILE "Enable metadata trace file collection" OFF) 55,56c55,56 < SET (H5_METADATA_TRACE_FILE 1) < ENDIF (HDF5_METADATA_TRACE_FILE) --- > SET (H5_METADATA_TRACE_FILE 1) > ENDIF() 58,64c58,62 < # ---------------------------------------------------------------------- < # Decide whether the data accuracy has higher priority during data < # conversions. If not, some hard conversions will still be prefered even < # though the data may be wrong (for example, some compilers don't < # support denormalized floating values) to maximize speed. < # < OPTION (HDF5_WANT_DATA_ACCURACY "IF data accuracy is guaranteed during data conversions" ON) --- > #----------------------------------------------------------------------------- > # --enable-dconv-accuracy > # IF data accuracy is guaranteed during data conversions [default=yes] > #----------------------------------------------------------------------------- > option (HDF5_WANT_DATA_ACCURACY "IF data accuracy is guaranteed during data conversions" ON) 66,67c64,65 < SET (H5_WANT_DATA_ACCURACY 1) < ENDIF(HDF5_WANT_DATA_ACCURACY) --- > SET (H5_WANT_DATA_ACCURACY 1) > ENDIF() 69,75c67,71 < # ---------------------------------------------------------------------- < # Decide whether the presence of user's exception handling functions is < # checked and data conversion exceptions are returned. This is mainly < # for the speed optimization of hard conversions. Soft conversions can < # actually benefit little. < # < OPTION (HDF5_WANT_DCONV_EXCEPTION "exception handling functions is checked during data conversions" ON) --- > #----------------------------------------------------------------------------- > # --enable-dconv-exception > # exception handling functions is checked during data conversions > #----------------------------------------------------------------------------- > option (HDF5_WANT_DCONV_EXCEPTION "exception handling functions is checked during data conversions" ON) 77,78c73,74 < SET (H5_WANT_DCONV_EXCEPTION 1) < ENDIF (HDF5_WANT_DCONV_EXCEPTION) --- > SET (H5_WANT_DCONV_EXCEPTION 1) > ENDIF() 80,81c76,77 < SET (LINUX_LFS 0) < IF (CMAKE_SYSTEM MATCHES "Linux-([3-9]\\.[0-9]|2\\.[4-9])\\.") --- > SET(LINUX_LFS 0) > IF(CMAKE_SYSTEM MATCHES "Linux-([3-9]\\.[0-9]|2\\.[4-9])\\.") 83,94c79,90 < ADD_DEFINITIONS (-D_POSIX_SOURCE -D_BSD_SOURCE) < OPTION (HDF5_ENABLE_LARGE_FILE "Enable support for large (64-bit) files on Linux." ON) < IF (HDF5_ENABLE_LARGE_FILE) < SET (LARGEFILE 1) < ENDIF (HDF5_ENABLE_LARGE_FILE) < ENDIF (CMAKE_SYSTEM MATCHES "Linux-([3-9]\\.[0-9]|2\\.[4-9])\\.") < SET (HDF5_EXTRA_FLAGS) < IF (LINUX_LFS) < SET (HDF5_EXTRA_FLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE) < SET (CMAKE_REQUIRED_DEFINITIONS ${HDF5_EXTRA_FLAGS}) < ENDIF (LINUX_LFS) < ADD_DEFINITIONS (${HDF5_EXTRA_FLAGS}) --- > ADD_DEFINITIONS(-D_POSIX_SOURCE -D_BSD_SOURCE) > OPTION(HDF5_ENABLE_LINUX_LFS "Enable support for large (64-bit) files on Linux." ON) > IF(HDF5_ENABLE_LINUX_LFS) > SET(LINUX_LFS 1) > ENDIF(HDF5_ENABLE_LINUX_LFS) > ENDIF(CMAKE_SYSTEM MATCHES "Linux-([3-9]\\.[0-9]|2\\.[4-9])\\.") > SET(HDF5_EXTRA_FLAGS) > IF(LINUX_LFS) > SET(HDF5_EXTRA_FLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE) > SET(CMAKE_REQUIRED_DEFINITIONS ${HDF5_EXTRA_FLAGS}) > ENDIF(LINUX_LFS) > ADD_DEFINITIONS(${HDF5_EXTRA_FLAGS}) 97,135c93,116 < # SET (DEFAULT_STREAM_VFD OFF) < #ELSE (WIN32) < # SET (DEFAULT_STREAM_VFD ON) < #ENDIF (WIN32) < #OPTION (HDF5_STREAM_VFD "Compile Stream Virtual File Driver support" ${DEFAULT_STREAM_VFD}) < OPTION (HDF5_ENABLE_HSIZET "Enable datasets larger than memory" ON) < < SET (WINDOWS) < IF (WIN32) < IF (NOT UNIX) < SET (WINDOWS 1) < ENDIF (NOT UNIX) < ENDIF (WIN32) < < # TODO -------------------------------------------------------------------------- < # Should the Default Virtual File Driver be compiled? < # This is hard-coded now but option should added to match configure < # < IF (WINDOWS) < SET (H5_HAVE_WINDOWS 1) < # SET (H5_WINDOWS_USE_STDIO 0) < # ---------------------------------------------------------------------- < # Set the flag to indicate that the machine has window style pathname, < # that is, "drive-letter:\" (e.g. "C:") or "drive-letter:/" (e.g. "C:/"). < # (This flag should be _unset_ for all machines, except for Windows) < # < SET (H5_HAVE_WINDOW_PATH 1) < SET (WINDOWS_MAX_BUF (1024 * 1024 * 1024)) < SET (H5_DEFAULT_VFD H5FD_WINDOWS) < ELSE (WINDOWS) < SET (H5_DEFAULT_VFD H5FD_SEC2) < ENDIF (WINDOWS) < < # ---------------------------------------------------------------------- < # Set the flag to indicate that the machine can handle converting < # floating-point to long long values. < # (This flag should be _unset_ for all machines) < # < # SET (H5_HW_FP_TO_LLONG_NOT_WORKS 0) --- > # SET (DEFAULT_STREAM_VFD OFF) > #ELSE(WIN32) > # SET(DEFAULT_STREAM_VFD ON) > #ENDIF(WIN32) > #OPTION(HDF5_STREAM_VFD "Compile Stream Virtual File Driver support" ${DEFAULT_STREAM_VFD}) > OPTION(HDF5_ENABLE_HSIZET "Enable datasets larger than memory" ON) > > SET(WINDOWS) > IF(WIN32) > IF(NOT UNIX) > SET(WINDOWS 1) > ENDIF(NOT UNIX) > ENDIF(WIN32) > > IF(WINDOWS) > # Define the default virtual file driver to compile */ > SET(H5_HAVE_WINDOWS 1) > SET(H5_HAVE_WINDOW_PATH 1) > # SET(H5_WINDOWS_USE_STDIO 0) > SET(H5_WINDOWS_MAX_BUF (1024 * 1024 * 1024)) > SET(H5_DEFAULT_VFD H5FD_WINDOWS) > ELSE(WINDOWS) > SET(H5_DEFAULT_VFD H5FD_SEC2) > ENDIF(WINDOWS) 144,150c125,131 < SET (LINK_LIBS "") < MACRO (CHECK_LIBRARY_EXISTS_CONCAT LIBRARY SYMBOL VARIABLE) < CHECK_LIBRARY_EXISTS ("${LIBRARY};${LINK_LIBS}" ${SYMBOL} "" ${VARIABLE}) < IF (${VARIABLE}) < SET (LINK_LIBS ${LINK_LIBS} ${LIBRARY}) < ENDIF (${VARIABLE}) < ENDMACRO (CHECK_LIBRARY_EXISTS_CONCAT) --- > SET(LINK_LIBS "") > MACRO(CHECK_LIBRARY_EXISTS_CONCAT LIBRARY SYMBOL VARIABLE) > CHECK_LIBRARY_EXISTS("${LIBRARY};${LINK_LIBS}" ${SYMBOL} "" ${VARIABLE}) > IF(${VARIABLE}) > SET(LINK_LIBS ${LINK_LIBS} ${LIBRARY}) > ENDIF(${VARIABLE}) > ENDMACRO(CHECK_LIBRARY_EXISTS_CONCAT) 155,170c136,151 < IF (WINDOWS) < SET (H5_HAVE_LIBM 1) < ELSE (WINDOWS) < CHECK_LIBRARY_EXISTS_CONCAT ("m" printf H5_HAVE_LIBM) < ENDIF (WINDOWS) < CHECK_LIBRARY_EXISTS_CONCAT ("ws2_32" printf H5_HAVE_LIBWS2_32) < CHECK_LIBRARY_EXISTS_CONCAT ("wsock32" printf H5_HAVE_LIBWSOCK32) < #CHECK_LIBRARY_EXISTS_CONCAT ("dl" dlopen H5_HAVE_LIBDL) < CHECK_LIBRARY_EXISTS_CONCAT ("ucb" gethostname H5_HAVE_LIBUCB) < CHECK_LIBRARY_EXISTS_CONCAT ("socket" connect H5_HAVE_LIBSOCKET) < CHECK_LIBRARY_EXISTS ("c" gethostbyname "" NOT_NEED_LIBNSL) < < < IF (NOT NOT_NEED_LIBNSL) < CHECK_LIBRARY_EXISTS_CONCAT ("nsl" gethostbyname H5_HAVE_LIBNSL) < ENDIF (NOT NOT_NEED_LIBNSL) --- > IF(WINDOWS) > SET(H5_HAVE_LIBM 1) > ELSE(WINDOWS) > CHECK_LIBRARY_EXISTS_CONCAT("m" printf H5_HAVE_LIBM) > ENDIF(WINDOWS) > CHECK_LIBRARY_EXISTS_CONCAT("ws2_32" printf H5_HAVE_LIBWS2_32) > CHECK_LIBRARY_EXISTS_CONCAT("wsock32" printf H5_HAVE_LIBWSOCK32) > #CHECK_LIBRARY_EXISTS_CONCAT("dl" dlopen H5_HAVE_LIBDL) > CHECK_LIBRARY_EXISTS_CONCAT("ucb" gethostname H5_HAVE_LIBUCB) > CHECK_LIBRARY_EXISTS_CONCAT("socket" connect H5_HAVE_LIBSOCKET) > CHECK_LIBRARY_EXISTS("c" gethostbyname "" NOT_NEED_LIBNSL) > > > IF(NOT NOT_NEED_LIBNSL) > CHECK_LIBRARY_EXISTS_CONCAT("nsl" gethostbyname H5_HAVE_LIBNSL) > ENDIF(NOT NOT_NEED_LIBNSL) 173c154 < SET (USE_INCLUDES "") --- > SET(USE_INCLUDES "") 177,182c158,163 < MACRO (CHECK_INCLUDE_FILE_CONCAT FILE VARIABLE) < CHECK_INCLUDE_FILES ("${USE_INCLUDES};${FILE}" ${VARIABLE}) < IF (${VARIABLE}) < SET (USE_INCLUDES ${USE_INCLUDES} ${FILE}) < ENDIF (${VARIABLE}) < ENDMACRO (CHECK_INCLUDE_FILE_CONCAT) --- > MACRO(CHECK_INCLUDE_FILE_CONCAT FILE VARIABLE) > CHECK_INCLUDE_FILES("${USE_INCLUDES};${FILE}" ${VARIABLE}) > IF(${VARIABLE}) > SET(USE_INCLUDES ${USE_INCLUDES} ${FILE}) > ENDIF(${VARIABLE}) > ENDMACRO(CHECK_INCLUDE_FILE_CONCAT) 187,195c168,176 < IF (WINDOWS) < SET (H5_HAVE_IO_H 1) < SET (H5_HAVE_SETJMP_H 1) < SET (H5_HAVE_STDDEF_H 1) < SET (H5_HAVE_SYS_STAT_H 1) < SET (H5_HAVE_SYS_TIMEB_H 1) < SET (H5_HAVE_SYS_TYPES_H 1) < SET (H5_HAVE_WINSOCK_H 1) < ENDIF (WINDOWS) --- > IF(WINDOWS) > SET(H5_HAVE_IO_H 1) > SET(H5_HAVE_SETJMP_H 1) > SET(H5_HAVE_STDDEF_H 1) > SET(H5_HAVE_SYS_STAT_H 1) > SET(H5_HAVE_SYS_TIMEB_H 1) > SET(H5_HAVE_SYS_TYPES_H 1) > SET(H5_HAVE_WINSOCK_H 1) > ENDIF(WINDOWS) 200,232c181,213 < CHECK_INCLUDE_FILE_CONCAT ("globus/common.h" H5_HAVE_GLOBUS_COMMON_H) < CHECK_INCLUDE_FILE_CONCAT ("io.h" H5_HAVE_IO_H) < CHECK_INCLUDE_FILE_CONCAT ("mfhdf.h" H5_HAVE_MFHDF_H) < CHECK_INCLUDE_FILE_CONCAT ("pdb.h" H5_HAVE_PDB_H) < CHECK_INCLUDE_FILE_CONCAT ("pthread.h" H5_HAVE_PTHREAD_H) < CHECK_INCLUDE_FILE_CONCAT ("setjmp.h" H5_HAVE_SETJMP_H) < CHECK_INCLUDE_FILE_CONCAT ("srbclient.h" H5_HAVE_SRBCLIENT_H) < CHECK_INCLUDE_FILE_CONCAT ("stddef.h" H5_HAVE_STDDEF_H) < CHECK_INCLUDE_FILE_CONCAT ("stdint.h" H5_HAVE_STDINT_H) < CHECK_INCLUDE_FILE_CONCAT ("string.h" H5_HAVE_STRING_H) < CHECK_INCLUDE_FILE_CONCAT ("strings.h" H5_HAVE_STRINGS_H) < CHECK_INCLUDE_FILE_CONCAT ("sys/ioctl.h" H5_HAVE_SYS_IOCTL_H) < CHECK_INCLUDE_FILE_CONCAT ("sys/proc.h" H5_HAVE_SYS_PROC_H) < CHECK_INCLUDE_FILE_CONCAT ("sys/resource.h" H5_HAVE_SYS_RESOURCE_H) < CHECK_INCLUDE_FILE_CONCAT ("sys/socket.h" H5_HAVE_SYS_SOCKET_H) < CHECK_INCLUDE_FILE_CONCAT ("sys/stat.h" H5_HAVE_SYS_STAT_H) < IF (CMAKE_SYSTEM_NAME MATCHES "OSF") < CHECK_INCLUDE_FILE_CONCAT ("sys/sysinfo.h" H5_HAVE_SYS_SYSINFO_H) < ELSE (CMAKE_SYSTEM_NAME MATCHES "OSF") < SET (H5_HAVE_SYS_SYSINFO_H "" CACHE INTERNAL "" FORCE) < ENDIF (CMAKE_SYSTEM_NAME MATCHES "OSF") < CHECK_INCLUDE_FILE_CONCAT ("sys/time.h" H5_HAVE_SYS_TIME_H) < CHECK_INCLUDE_FILE_CONCAT ("time.h" H5_HAVE_TIME_H) < CHECK_INCLUDE_FILE_CONCAT ("sys/timeb.h" H5_HAVE_SYS_TIMEB_H) < CHECK_INCLUDE_FILE_CONCAT ("sys/types.h" H5_HAVE_SYS_TYPES_H) < CHECK_INCLUDE_FILE_CONCAT ("unistd.h" H5_HAVE_UNISTD_H) < CHECK_INCLUDE_FILE_CONCAT ("stdlib.h" H5_HAVE_STDLIB_H) < CHECK_INCLUDE_FILE_CONCAT ("memory.h" H5_HAVE_MEMORY_H) < CHECK_INCLUDE_FILE_CONCAT ("dlfcn.h" H5_HAVE_DLFCN_H) < CHECK_INCLUDE_FILE_CONCAT ("features.h" H5_HAVE_FEATURES_H) < CHECK_INCLUDE_FILE_CONCAT ("inttypes.h" H5_HAVE_INTTYPES_H) < CHECK_INCLUDE_FILE_CONCAT ("winsock.h" H5_HAVE_WINSOCK_H) < CHECK_INCLUDE_FILE_CONCAT ("netinet/in.h" H5_HAVE_NETINET_IN_H) --- > CHECK_INCLUDE_FILE_CONCAT("globus/common.h" H5_HAVE_GLOBUS_COMMON_H) > CHECK_INCLUDE_FILE_CONCAT("io.h" H5_HAVE_IO_H) > CHECK_INCLUDE_FILE_CONCAT("mfhdf.h" H5_HAVE_MFHDF_H) > CHECK_INCLUDE_FILE_CONCAT("pdb.h" H5_HAVE_PDB_H) > CHECK_INCLUDE_FILE_CONCAT("pthread.h" H5_HAVE_PTHREAD_H) > CHECK_INCLUDE_FILE_CONCAT("setjmp.h" H5_HAVE_SETJMP_H) > CHECK_INCLUDE_FILE_CONCAT("srbclient.h" H5_HAVE_SRBCLIENT_H) > CHECK_INCLUDE_FILE_CONCAT("stddef.h" H5_HAVE_STDDEF_H) > CHECK_INCLUDE_FILE_CONCAT("stdint.h" H5_HAVE_STDINT_H) > CHECK_INCLUDE_FILE_CONCAT("string.h" H5_HAVE_STRING_H) > CHECK_INCLUDE_FILE_CONCAT("strings.h" H5_HAVE_STRINGS_H) > CHECK_INCLUDE_FILE_CONCAT("sys/ioctl.h" H5_HAVE_SYS_IOCTL_H) > CHECK_INCLUDE_FILE_CONCAT("sys/proc.h" H5_HAVE_SYS_PROC_H) > CHECK_INCLUDE_FILE_CONCAT("sys/resource.h" H5_HAVE_SYS_RESOURCE_H) > CHECK_INCLUDE_FILE_CONCAT("sys/socket.h" H5_HAVE_SYS_SOCKET_H) > CHECK_INCLUDE_FILE_CONCAT("sys/stat.h" H5_HAVE_SYS_STAT_H) > IF(CMAKE_SYSTEM_NAME MATCHES "OSF") > CHECK_INCLUDE_FILE_CONCAT("sys/sysinfo.h" H5_HAVE_SYS_SYSINFO_H) > ELSE(CMAKE_SYSTEM_NAME MATCHES "OSF") > SET(H5_HAVE_SYS_SYSINFO_H "" CACHE INTERNAL "" FORCE) > ENDIF(CMAKE_SYSTEM_NAME MATCHES "OSF") > CHECK_INCLUDE_FILE_CONCAT("sys/time.h" H5_HAVE_SYS_TIME_H) > CHECK_INCLUDE_FILE_CONCAT("time.h" H5_HAVE_TIME_H) > CHECK_INCLUDE_FILE_CONCAT("sys/timeb.h" H5_HAVE_SYS_TIMEB_H) > CHECK_INCLUDE_FILE_CONCAT("sys/types.h" H5_HAVE_SYS_TYPES_H) > CHECK_INCLUDE_FILE_CONCAT("unistd.h" H5_HAVE_UNISTD_H) > CHECK_INCLUDE_FILE_CONCAT("stdlib.h" H5_HAVE_STDLIB_H) > CHECK_INCLUDE_FILE_CONCAT("memory.h" H5_HAVE_MEMORY_H) > CHECK_INCLUDE_FILE_CONCAT("dlfcn.h" H5_HAVE_DLFCN_H) > CHECK_INCLUDE_FILE_CONCAT("features.h" H5_HAVE_FEATURES_H) > CHECK_INCLUDE_FILE_CONCAT("inttypes.h" H5_HAVE_INTTYPES_H) > CHECK_INCLUDE_FILE_CONCAT("winsock.h" H5_HAVE_WINSOCK_H) > CHECK_INCLUDE_FILE_CONCAT("netinet/in.h" H5_HAVE_NETINET_IN_H) 237c218 < # has been initialized (e.g. the project also includes some c++) --- > # has been initialized (e.g. the project also includes some c++) 239c220 < CHECK_INCLUDE_FILE_CXX ("stdint.h" H5_HAVE_STDINT_H_CXX) --- > CHECK_INCLUDE_FILE_CXX("stdint.h" H5_HAVE_STDINT_H_CXX) 248,257c229,238 < MACRO (H5_CHECK_TYPE_SIZE type var) < SET (aType ${type}) < SET (aVar ${var}) < # MESSAGE (STATUS "Checking size of ${aType} and storing into ${aVar}") < CHECK_TYPE_SIZE (${aType} ${aVar}) < IF (NOT ${aVar}) < SET (${aVar} 0 CACHE INTERNAL "SizeOf for ${aType}") < # MESSAGE (STATUS "Size of ${aType} was NOT Found") < ENDIF (NOT ${aVar}) < ENDMACRO (H5_CHECK_TYPE_SIZE) --- > MACRO ( H5_CHECK_TYPE_SIZE type var) > SET (aType ${type}) > SET (aVar ${var}) > #MESSAGE(STATUS "Checking size of ${aType} and storing into ${aVar}") > CHECK_TYPE_SIZE(${aType} ${aVar}) > IF (NOT ${aVar}) > SET (${aVar} 0 CACHE INTERNAL "SizeOf for ${aType}") > # MESSAGE(STATUS "Size of ${aType} was NOT Found") > ENDIF() > ENDMACRO() 261,264c242,245 < H5_CHECK_TYPE_SIZE (char H5_SIZEOF_CHAR) < H5_CHECK_TYPE_SIZE (short H5_SIZEOF_SHORT) < H5_CHECK_TYPE_SIZE (int H5_SIZEOF_INT) < H5_CHECK_TYPE_SIZE (unsigned H5_SIZEOF_UNSIGNED) --- > H5_CHECK_TYPE_SIZE(char H5_SIZEOF_CHAR) > H5_CHECK_TYPE_SIZE(short H5_SIZEOF_SHORT) > H5_CHECK_TYPE_SIZE(int H5_SIZEOF_INT) > H5_CHECK_TYPE_SIZE(unsigned H5_SIZEOF_UNSIGNED) 266,269c247,250 < H5_CHECK_TYPE_SIZE (long H5_SIZEOF_LONG) < ENDIF (NOT APPLE) < H5_CHECK_TYPE_SIZE ("long long" H5_SIZEOF_LONG_LONG) < H5_CHECK_TYPE_SIZE (__int64 H5_SIZEOF___INT64) --- > H5_CHECK_TYPE_SIZE(long H5_SIZEOF_LONG) > ENDIF() > H5_CHECK_TYPE_SIZE("long long" H5_SIZEOF_LONG_LONG) > H5_CHECK_TYPE_SIZE(__int64 H5_SIZEOF___INT64) 271,272c252,253 < SET (H5_SIZEOF___INT64 0) < ENDIF (NOT H5_SIZEOF___INT64) --- > SET (H5_SIZEOF___INT64 0) > ENDIF() 274,300c255,281 < H5_CHECK_TYPE_SIZE (float H5_SIZEOF_FLOAT) < H5_CHECK_TYPE_SIZE (double H5_SIZEOF_DOUBLE) < H5_CHECK_TYPE_SIZE ("long double" H5_SIZEOF_LONG_DOUBLE) < H5_CHECK_TYPE_SIZE (int8_t H5_SIZEOF_INT8_T) < H5_CHECK_TYPE_SIZE (uint8_t H5_SIZEOF_UINT8_T) < H5_CHECK_TYPE_SIZE (int_least8_t H5_SIZEOF_INT_LEAST8_T) < H5_CHECK_TYPE_SIZE (uint_least8_t H5_SIZEOF_UINT_LEAST8_T) < H5_CHECK_TYPE_SIZE (int_fast8_t H5_SIZEOF_INT_FAST8_T) < H5_CHECK_TYPE_SIZE (uint_fast8_t H5_SIZEOF_UINT_FAST8_T) < H5_CHECK_TYPE_SIZE (int16_t H5_SIZEOF_INT16_T) < H5_CHECK_TYPE_SIZE (uint16_t H5_SIZEOF_UINT16_T) < H5_CHECK_TYPE_SIZE (int_least16_t H5_SIZEOF_INT_LEAST16_T) < H5_CHECK_TYPE_SIZE (uint_least16_t H5_SIZEOF_UINT_LEAST16_T) < H5_CHECK_TYPE_SIZE (int_fast16_t H5_SIZEOF_INT_FAST16_T) < H5_CHECK_TYPE_SIZE (uint_fast16_t H5_SIZEOF_UINT_FAST16_T) < H5_CHECK_TYPE_SIZE (int32_t H5_SIZEOF_INT32_T) < H5_CHECK_TYPE_SIZE (uint32_t H5_SIZEOF_UINT32_T) < H5_CHECK_TYPE_SIZE (int_least32_t H5_SIZEOF_INT_LEAST32_T) < H5_CHECK_TYPE_SIZE (uint_least32_t H5_SIZEOF_UINT_LEAST32_T) < H5_CHECK_TYPE_SIZE (int_fast32_t H5_SIZEOF_INT_FAST32_T) < H5_CHECK_TYPE_SIZE (uint_fast32_t H5_SIZEOF_UINT_FAST32_T) < H5_CHECK_TYPE_SIZE (int64_t H5_SIZEOF_INT64_T) < H5_CHECK_TYPE_SIZE (uint64_t H5_SIZEOF_UINT64_T) < H5_CHECK_TYPE_SIZE (int_least64_t H5_SIZEOF_INT_LEAST64_T) < H5_CHECK_TYPE_SIZE (uint_least64_t H5_SIZEOF_UINT_LEAST64_T) < H5_CHECK_TYPE_SIZE (int_fast64_t H5_SIZEOF_INT_FAST64_T) < H5_CHECK_TYPE_SIZE (uint_fast64_t H5_SIZEOF_UINT_FAST64_T) --- > H5_CHECK_TYPE_SIZE(float H5_SIZEOF_FLOAT) > H5_CHECK_TYPE_SIZE(double H5_SIZEOF_DOUBLE) > H5_CHECK_TYPE_SIZE("long double" H5_SIZEOF_LONG_DOUBLE) > H5_CHECK_TYPE_SIZE(int8_t H5_SIZEOF_INT8_T) > H5_CHECK_TYPE_SIZE(uint8_t H5_SIZEOF_UINT8_T) > H5_CHECK_TYPE_SIZE(int_least8_t H5_SIZEOF_INT_LEAST8_T) > H5_CHECK_TYPE_SIZE(uint_least8_t H5_SIZEOF_UINT_LEAST8_T) > H5_CHECK_TYPE_SIZE(int_fast8_t H5_SIZEOF_INT_FAST8_T) > H5_CHECK_TYPE_SIZE(uint_fast8_t H5_SIZEOF_UINT_FAST8_T) > H5_CHECK_TYPE_SIZE(int16_t H5_SIZEOF_INT16_T) > H5_CHECK_TYPE_SIZE(uint16_t H5_SIZEOF_UINT16_T) > H5_CHECK_TYPE_SIZE(int_least16_t H5_SIZEOF_INT_LEAST16_T) > H5_CHECK_TYPE_SIZE(uint_least16_t H5_SIZEOF_UINT_LEAST16_T) > H5_CHECK_TYPE_SIZE(int_fast16_t H5_SIZEOF_INT_FAST16_T) > H5_CHECK_TYPE_SIZE(uint_fast16_t H5_SIZEOF_UINT_FAST16_T) > H5_CHECK_TYPE_SIZE(int32_t H5_SIZEOF_INT32_T) > H5_CHECK_TYPE_SIZE(uint32_t H5_SIZEOF_UINT32_T) > H5_CHECK_TYPE_SIZE(int_least32_t H5_SIZEOF_INT_LEAST32_T) > H5_CHECK_TYPE_SIZE(uint_least32_t H5_SIZEOF_UINT_LEAST32_T) > H5_CHECK_TYPE_SIZE(int_fast32_t H5_SIZEOF_INT_FAST32_T) > H5_CHECK_TYPE_SIZE(uint_fast32_t H5_SIZEOF_UINT_FAST32_T) > H5_CHECK_TYPE_SIZE(int64_t H5_SIZEOF_INT64_T) > H5_CHECK_TYPE_SIZE(uint64_t H5_SIZEOF_UINT64_T) > H5_CHECK_TYPE_SIZE(int_least64_t H5_SIZEOF_INT_LEAST64_T) > H5_CHECK_TYPE_SIZE(uint_least64_t H5_SIZEOF_UINT_LEAST64_T) > H5_CHECK_TYPE_SIZE(int_fast64_t H5_SIZEOF_INT_FAST64_T) > H5_CHECK_TYPE_SIZE(uint_fast64_t H5_SIZEOF_UINT_FAST64_T) 302,309c283,290 < H5_CHECK_TYPE_SIZE (size_t H5_SIZEOF_SIZE_T) < H5_CHECK_TYPE_SIZE (ssize_t H5_SIZEOF_SSIZE_T) < IF (NOT H5_SIZEOF_SSIZE_T) < SET (H5_SIZEOF_SSIZE_T 0) < ENDIF (NOT H5_SIZEOF_SSIZE_T) < ENDIF (NOT APPLE) < H5_CHECK_TYPE_SIZE (off_t H5_SIZEOF_OFF_T) < H5_CHECK_TYPE_SIZE (off64_t H5_SIZEOF_OFF64_T) --- > H5_CHECK_TYPE_SIZE(size_t H5_SIZEOF_SIZE_T) > H5_CHECK_TYPE_SIZE(ssize_t H5_SIZEOF_SSIZE_T) > IF (NOT H5_SIZEOF_SSIZE_T) > SET (H5_SIZEOF_SSIZE_T 0) > ENDIF() > ENDIF() > H5_CHECK_TYPE_SIZE(off_t H5_SIZEOF_OFF_T) > H5_CHECK_TYPE_SIZE(off64_t H5_SIZEOF_OFF64_T) 311,312c292,293 < SET (H5_SIZEOF_OFF64_T 0) < ENDIF (NOT H5_SIZEOF_OFF64_T) --- > SET (H5_SIZEOF_OFF64_T 0) > ENDIF() 316c297 < SET (CMAKE_REQUIRED_LIBRARIES ${LINK_LIBS}) --- > SET(CMAKE_REQUIRED_LIBRARIES ${LINK_LIBS}) 320,368c301,346 < IF (WINDOWS) < SET (H5_HAVE_STRDUP 1) < SET (H5_HAVE_SYSTEM 1) < SET (H5_HAVE_DIFFTIME 1) < SET (H5_HAVE_LONGJMP 1) < SET (H5_STDC_HEADERS 1) < SET (H5_HAVE_GETHOSTNAME 1) < ENDIF (WINDOWS) < < CHECK_FUNCTION_EXISTS (alarm H5_HAVE_ALARM) < CHECK_FUNCTION_EXISTS (fork H5_HAVE_FORK) < CHECK_FUNCTION_EXISTS (frexpf H5_HAVE_FREXPF) < CHECK_FUNCTION_EXISTS (frexpl H5_HAVE_FREXPL) < < CHECK_FUNCTION_EXISTS (gethostname H5_HAVE_GETHOSTNAME) < CHECK_FUNCTION_EXISTS (getpwuid H5_HAVE_GETPWUID) < CHECK_FUNCTION_EXISTS (getrusage H5_HAVE_GETRUSAGE) < CHECK_FUNCTION_EXISTS (lstat H5_HAVE_LSTAT) < < CHECK_FUNCTION_EXISTS (rand_r H5_HAVE_RAND_R) < CHECK_FUNCTION_EXISTS (random H5_HAVE_RANDOM) < CHECK_FUNCTION_EXISTS (setsysinfo H5_HAVE_SETSYSINFO) < < CHECK_FUNCTION_EXISTS (signal H5_HAVE_SIGNAL) < CHECK_FUNCTION_EXISTS (longjmp H5_HAVE_LONGJMP) < CHECK_FUNCTION_EXISTS (setjmp H5_HAVE_SETJMP) < CHECK_FUNCTION_EXISTS (siglongjmp H5_HAVE_SIGLONGJMP) < CHECK_FUNCTION_EXISTS (sigsetjmp H5_HAVE_SIGSETJMP) < CHECK_FUNCTION_EXISTS (sigaction H5_HAVE_SIGACTION) < CHECK_FUNCTION_EXISTS (sigprocmask H5_HAVE_SIGPROCMASK) < < CHECK_FUNCTION_EXISTS (snprintf H5_HAVE_SNPRINTF) < CHECK_FUNCTION_EXISTS (srandom H5_HAVE_SRANDOM) < CHECK_FUNCTION_EXISTS (strdup H5_HAVE_STRDUP) < CHECK_FUNCTION_EXISTS (symlink H5_HAVE_SYMLINK) < CHECK_FUNCTION_EXISTS (system H5_HAVE_SYSTEM) < < CHECK_FUNCTION_EXISTS (tmpfile H5_HAVE_TMPFILE) < CHECK_FUNCTION_EXISTS (vasprintf H5_HAVE_VASPRINTF) < CHECK_FUNCTION_EXISTS (waitpid H5_HAVE_WAITPID) < < CHECK_FUNCTION_EXISTS (vsnprintf H5_HAVE_VSNPRINTF) < CHECK_FUNCTION_EXISTS (ioctl H5_HAVE_IOCTL) < #CHECK_FUNCTION_EXISTS (gettimeofday H5_HAVE_GETTIMEOFDAY) < CHECK_FUNCTION_EXISTS (difftime H5_HAVE_DIFFTIME) < CHECK_FUNCTION_EXISTS (fseeko H5_HAVE_FSEEKO) < CHECK_FUNCTION_EXISTS (ftello H5_HAVE_FTELLO) < CHECK_FUNCTION_EXISTS (fstat64 H5_HAVE_FSTAT64) < CHECK_FUNCTION_EXISTS (stat64 H5_HAVE_STAT64) --- > IF(WINDOWS) > SET(H5_HAVE_STRDUP 1) > SET(H5_HAVE_SYSTEM 1) > SET(H5_HAVE_DIFFTIME 1) > SET(H5_HAVE_LONGJMP 1) > SET(H5_STDC_HEADERS 1) > SET(H5_HAVE_GETHOSTNAME 1) > ENDIF(WINDOWS) > > CHECK_FUNCTION_EXISTS(strdup H5_HAVE_STRDUP) > CHECK_FUNCTION_EXISTS(snprintf H5_HAVE_SNPRINTF) > CHECK_FUNCTION_EXISTS(system H5_HAVE_SYSTEM) > CHECK_FUNCTION_EXISTS(vsnprintf H5_HAVE_VSNPRINTF) > CHECK_FUNCTION_EXISTS(waitpid H5_HAVE_WAITPID) > CHECK_FUNCTION_EXISTS(signal H5_HAVE_SIGNAL) > CHECK_FUNCTION_EXISTS(ioctl H5_HAVE_IOCTL) > CHECK_FUNCTION_EXISTS(sigaction H5_HAVE_SIGACTION) > CHECK_FUNCTION_EXISTS(getpwuid H5_HAVE_GETPWUID) > CHECK_FUNCTION_EXISTS(getrusage H5_HAVE_GETRUSAGE) > #CHECK_FUNCTION_EXISTS(gettimeofday H5_HAVE_GETTIMEOFDAY) > CHECK_FUNCTION_EXISTS(longjmp H5_HAVE_LONGJMP) > CHECK_FUNCTION_EXISTS(fork H5_HAVE_FORK) > CHECK_FUNCTION_EXISTS(difftime H5_HAVE_DIFFTIME) > CHECK_FUNCTION_EXISTS(gethostname H5_HAVE_GETHOSTNAME) > CHECK_FUNCTION_EXISTS(sigaction H5_HAVE_SIGACTION) > CHECK_FUNCTION_EXISTS(frexpf H5_HAVE_FREXPF) > CHECK_FUNCTION_EXISTS(frexpl H5_HAVE_FREXPL) > CHECK_FUNCTION_EXISTS(alarm H5_HAVE_ALARM) > CHECK_FUNCTION_EXISTS(fseeko H5_HAVE_FSEEKO) > CHECK_FUNCTION_EXISTS(ftello H5_HAVE_FTELLO) > CHECK_FUNCTION_EXISTS(fstat64 H5_HAVE_FSTAT64) > CHECK_FUNCTION_EXISTS(random H5_HAVE_RANDOM) > CHECK_FUNCTION_EXISTS(rand_r H5_HAVE_RAND_R) > CHECK_FUNCTION_EXISTS(siglongjmp H5_HAVE_SIGLONGJMP) > CHECK_FUNCTION_EXISTS(srandom H5_HAVE_SRANDOM) > CHECK_FUNCTION_EXISTS(stat64 H5_HAVE_STAT64) > CHECK_FUNCTION_EXISTS(vasprintf H5_HAVE_VASPRINTF) > > # MPI checks > SET(CMAKE_REQUIRED_INCLUDES "${MPI_INCLUDE_PATH}/mpi.h" ) > SET(CMAKE_REQUIRED_LIBRARIES "${MPI_LIBRARY}" ) > CHECK_FUNCTION_EXISTS(MPI_File_get_size H5_HAVE_MPI_GET_SIZE) > > # For Fortran+MPI > CHECK_SYMBOL_EXISTS(MPI_Comm_c2f "${MPI_INCLUDE_PATH}/mpi.h" H5_HAVE_MPI_MULTI_LANG_Comm) > CHECK_SYMBOL_EXISTS(MPI_Info_c2f "${MPI_INCLUDE_PATH}/mpi.h" H5_HAVE_MPI_MULTI_LANG_Info) 377,383c355,360 < IF ("H5_HAVE_TIME_GETTIMEOFDAY" MATCHES "^H5_HAVE_TIME_GETTIMEOFDAY$") < TRY_COMPILE (HAVE_TIME_GETTIMEOFDAY < ${CMAKE_BINARY_DIR} < ${HDF5_SOURCE_DIR}/Resources/GetTimeOfDayTest.cpp < COMPILE_DEFINITIONS -DTRY_TIME_H < OUTPUT_VARIABLE OUTPUT < ) --- > IF("H5_HAVE_TIME_GETTIMEOFDAY" MATCHES "^H5_HAVE_TIME_GETTIMEOFDAY$") > TRY_COMPILE(HAVE_TIME_GETTIMEOFDAY > ${CMAKE_BINARY_DIR} > ${HDF5_SOURCE_DIR}/Resources/GetTimeOfDayTest.cpp > COMPILE_DEFINITIONS -DTRY_TIME_H > OUTPUT_VARIABLE OUTPUT) 385c362 < SET (H5_HAVE_TIME_GETTIMEOFDAY "1" CACHE INTERNAL "H5_HAVE_TIME_GETTIMEOFDAY") --- > SET (H5_HAVE_TIME_GETTIMEOFDAY "1" CACHE INTERNAL "H5_HAVE_TIME_GETTIMEOFDAY") 387c364 < ENDIF ("H5_HAVE_TIME_GETTIMEOFDAY" MATCHES "^H5_HAVE_TIME_GETTIMEOFDAY$") --- > ENDIF() 389,395c366,371 < IF ("H5_HAVE_SYS_TIME_GETTIMEOFDAY" MATCHES "^H5_HAVE_SYS_TIME_GETTIMEOFDAY$") < TRY_COMPILE (HAVE_SYS_TIME_GETTIMEOFDAY < ${CMAKE_BINARY_DIR} < ${HDF5_SOURCE_DIR}/Resources/GetTimeOfDayTest.cpp < COMPILE_DEFINITIONS -DTRY_SYS_TIME_H < OUTPUT_VARIABLE OUTPUT < ) --- > IF("H5_HAVE_SYS_TIME_GETTIMEOFDAY" MATCHES "^H5_HAVE_SYS_TIME_GETTIMEOFDAY$") > TRY_COMPILE(HAVE_SYS_TIME_GETTIMEOFDAY > ${CMAKE_BINARY_DIR} > ${HDF5_SOURCE_DIR}/Resources/GetTimeOfDayTest.cpp > COMPILE_DEFINITIONS -DTRY_SYS_TIME_H > OUTPUT_VARIABLE OUTPUT) 397c373 < SET (H5_HAVE_SYS_TIME_GETTIMEOFDAY "1" CACHE INTERNAL "H5_HAVE_SYS_TIME_GETTIMEOFDAY") --- > SET (H5_HAVE_SYS_TIME_GETTIMEOFDAY "1" CACHE INTERNAL "H5_HAVE_SYS_TIME_GETTIMEOFDAY") 399,400c375,376 < ENDIF ("H5_HAVE_SYS_TIME_GETTIMEOFDAY" MATCHES "^H5_HAVE_SYS_TIME_GETTIMEOFDAY$") < ENDIF (NOT MSVC) --- > ENDIF() > ENDIF() 403,409c379,385 < MESSAGE (STATUS "---------------------------------------------------------------") < MESSAGE (STATUS "Function 'gettimeofday()' was not found. HDF5 will use its") < MESSAGE (STATUS " own implementation.. This can happen on older versions of") < MESSAGE (STATUS " MinGW on Windows. Consider upgrading your MinGW installation") < MESSAGE (STATUS " to a newer version such as MinGW 3.12") < MESSAGE (STATUS "---------------------------------------------------------------") < ENDIF (NOT HAVE_SYS_TIME_GETTIMEOFDAY AND NOT H5_HAVE_GETTIMEOFDAY AND NOT MSVC) --- > MESSAGE(STATUS "---------------------------------------------------------------") > MESSAGE(STATUS "Function 'gettimeofday()' was not found. HDF5 will use its") > MESSAGE(STATUS " own implementation.. This can happen on older versions of") > MESSAGE(STATUS " MinGW on Windows. Consider upgrading your MinGW installation") > MESSAGE(STATUS " to a newer version such as MinGW 3.12") > MESSAGE(STATUS "---------------------------------------------------------------") > ENDIF() 413c389 < CHECK_SYMBOL_EXISTS (tzname "time.h" H5_HAVE_DECL_TZNAME) --- > CHECK_SYMBOL_EXISTS ( tzname "time.h" H5_HAVE_DECL_TZNAME) 418,421c394,397 < IF (NOT WINDOWS) < CHECK_SYMBOL_EXISTS (TIOCGWINSZ "sys/ioctl.h" H5_HAVE_TIOCGWINSZ) < CHECK_SYMBOL_EXISTS (TIOCGETD "sys/ioctl.h" H5_HAVE_TIOCGETD) < ENDIF (NOT WINDOWS) --- > IF(NOT WINDOWS) > CHECK_SYMBOL_EXISTS(TIOCGWINSZ "sys/ioctl.h" H5_HAVE_TIOCGWINSZ) > CHECK_SYMBOL_EXISTS(TIOCGETD "sys/ioctl.h" H5_HAVE_TIOCGETD) > ENDIF(NOT WINDOWS) 426,431c402,407 < IF (HDF5_STREAM_VFD) < CHECK_INCLUDE_FILE_CONCAT ("netdb.h" H5_HAVE_NETDB_H) < CHECK_INCLUDE_FILE_CONCAT ("netinet/tcp.h" H5_HAVE_NETINET_TCP_H) < CHECK_INCLUDE_FILE_CONCAT ("sys/filio.h" H5_HAVE_SYS_FILIO_H) < SET (H5_HAVE_STREAM 1) < ENDIF (HDF5_STREAM_VFD) --- > IF(HDF5_STREAM_VFD) > CHECK_INCLUDE_FILE_CONCAT("netdb.h" H5_HAVE_NETDB_H) > CHECK_INCLUDE_FILE_CONCAT("netinet/tcp.h" H5_HAVE_NETINET_TCP_H) > CHECK_INCLUDE_FILE_CONCAT("sys/filio.h" H5_HAVE_SYS_FILIO_H) > SET(H5_HAVE_STREAM 1) > ENDIF(HDF5_STREAM_VFD) 435,445c411,420 < MACRO (HDF5_FUNCTION_TEST OTHER_TEST) < IF ("H5_${OTHER_TEST}" MATCHES "^H5_${OTHER_TEST}$") < SET (MACRO_CHECK_FUNCTION_DEFINITIONS "-D${OTHER_TEST} ${CMAKE_REQUIRED_FLAGS}") < SET (OTHER_TEST_ADD_LIBRARIES) < IF (CMAKE_REQUIRED_LIBRARIES) < SET (OTHER_TEST_ADD_LIBRARIES "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}") < ENDIF (CMAKE_REQUIRED_LIBRARIES) < < FOREACH (def ${HDF5_EXTRA_TEST_DEFINITIONS}) < SET (MACRO_CHECK_FUNCTION_DEFINITIONS "${MACRO_CHECK_FUNCTION_DEFINITIONS} -D${def}=${${def}}") < ENDFOREACH (def) --- > MACRO(HDF5_FUNCTION_TEST OTHER_TEST) > IF("H5_${OTHER_TEST}" MATCHES "^H5_${OTHER_TEST}$") > SET(MACRO_CHECK_FUNCTION_DEFINITIONS "-D${OTHER_TEST} ${CMAKE_REQUIRED_FLAGS}") > SET(OTHER_TEST_ADD_LIBRARIES) > IF(CMAKE_REQUIRED_LIBRARIES) > SET(OTHER_TEST_ADD_LIBRARIES "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}") > ENDIF(CMAKE_REQUIRED_LIBRARIES) > FOREACH(def ${HDF5_EXTRA_TEST_DEFINITIONS}) > SET(MACRO_CHECK_FUNCTION_DEFINITIONS "${MACRO_CHECK_FUNCTION_DEFINITIONS} -D${def}=${${def}}") > ENDFOREACH(def) 447c422 < FOREACH (def --- > FOREACH(def 451,462c426,434 < H5_HAVE_SYS_SOCKET_H < ) < IF ("${def}") < SET (MACRO_CHECK_FUNCTION_DEFINITIONS "${MACRO_CHECK_FUNCTION_DEFINITIONS} -D${def}") < ENDIF ("${def}") < ENDFOREACH (def) < < IF (LINUX_LFS) < SET (MACRO_CHECK_FUNCTION_DEFINITIONS < "${MACRO_CHECK_FUNCTION_DEFINITIONS} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE" < ) < ENDIF (LINUX_LFS) --- > H5_HAVE_SYS_SOCKET_H) > IF("${def}") > SET(MACRO_CHECK_FUNCTION_DEFINITIONS "${MACRO_CHECK_FUNCTION_DEFINITIONS} -D${def}") > ENDIF("${def}") > ENDFOREACH(def) > IF(LINUX_LFS) > SET(MACRO_CHECK_FUNCTION_DEFINITIONS > "${MACRO_CHECK_FUNCTION_DEFINITIONS} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE") > ENDIF(LINUX_LFS) 465,484c437,454 < TRY_COMPILE (${OTHER_TEST} < ${CMAKE_BINARY_DIR} < ${HDF5_SOURCE_DIR}/Resources/HDF5Tests.c < CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_FUNCTION_DEFINITIONS} < "${OTHER_TEST_ADD_LIBRARIES}" < OUTPUT_VARIABLE OUTPUT < ) < IF (${OTHER_TEST}) < SET (H5_${OTHER_TEST} 1 CACHE INTERNAL "Other test ${FUNCTION}") < MESSAGE (STATUS "Performing Other Test ${OTHER_TEST} - Success") < ELSE (${OTHER_TEST}) < MESSAGE (STATUS "Performing Other Test ${OTHER_TEST} - Failed") < SET (H5_${OTHER_TEST} "" CACHE INTERNAL "Other test ${FUNCTION}") < FILE (APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log < "Performing Other Test ${OTHER_TEST} failed with the following output:\n" < "${OUTPUT}\n" < ) < ENDIF (${OTHER_TEST}) < ENDIF ("H5_${OTHER_TEST}" MATCHES "^H5_${OTHER_TEST}$") < ENDMACRO (HDF5_FUNCTION_TEST) --- > TRY_COMPILE(${OTHER_TEST} > ${CMAKE_BINARY_DIR} > ${HDF5_SOURCE_DIR}/Resources/HDF5Tests.c > CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_FUNCTION_DEFINITIONS} > "${OTHER_TEST_ADD_LIBRARIES}" > OUTPUT_VARIABLE OUTPUT) > IF(${OTHER_TEST}) > SET(H5_${OTHER_TEST} 1 CACHE INTERNAL "Other test ${FUNCTION}") > MESSAGE(STATUS "Performing Other Test ${OTHER_TEST} - Success") > ELSE(${OTHER_TEST}) > MESSAGE(STATUS "Performing Other Test ${OTHER_TEST} - Failed") > SET(H5_${OTHER_TEST} "" CACHE INTERNAL "Other test ${FUNCTION}") > WRITE_FILE(${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log > "Performing Other Test ${OTHER_TEST} failed with the following output:\n" > "${OUTPUT}\n" APPEND) > ENDIF(${OTHER_TEST}) > ENDIF("H5_${OTHER_TEST}" MATCHES "^H5_${OTHER_TEST}$") > ENDMACRO(HDF5_FUNCTION_TEST) 489,493c459,463 < IF (WINDOWS) < SET (H5_HAVE_TIMEZONE 1) < SET (H5_HAVE_FUNCTION 1) < ELSE (WINDOWS) < FOREACH (test --- > IF(WINDOWS) > SET(H5_HAVE_TIMEZONE 1) > SET(H5_HAVE_FUNCTION 1) > ELSE(WINDOWS) > FOREACH(test 514,517c484,487 < ) < HDF5_FUNCTION_TEST (${test}) < ENDFOREACH (test) < ENDIF (WINDOWS) --- > ) > HDF5_FUNCTION_TEST(${test}) > ENDFOREACH(test) > ENDIF(WINDOWS) 522,525c492,495 < IF (HAVE_OFF64_T) < CHECK_FUNCTION_EXISTS (lseek64 H5_HAVE_LSEEK64) < CHECK_FUNCTION_EXISTS (fseek64 H5_HAVE_FSEEK64) < ENDIF (HAVE_OFF64_T) --- > IF(HAVE_OFF64_T) > CHECK_FUNCTION_EXISTS(lseek64 H5_HAVE_LSEEK64) > CHECK_FUNCTION_EXISTS(fseek64 H5_HAVE_FSEEK64) > ENDIF(HAVE_OFF64_T) 530,547c500,516 < SET (HDF5_EXTRA_TEST_DEFINITIONS INLINE_TEST_INLINE) < FOREACH (inline_test inline __inline__ __inline) < SET (INLINE_TEST_INLINE ${inline_test}) < HDF5_FUNCTION_TEST (INLINE_TEST_${inline_test}) < ENDFOREACH (inline_test) < < SET (HDF5_EXTRA_TEST_DEFINITIONS) < IF (INLINE_TEST___inline__) < SET (H5_inline __inline__) < ELSE (INLINE_TEST___inline__) < IF (INLINE_TEST___inline) < SET (H5_inline __inline) < ELSE (INLINE_TEST___inline) < IF (INLINE_TEST_inline) < SET (H5_inline inline) < ENDIF (INLINE_TEST_inline) < ENDIF (INLINE_TEST___inline) < ENDIF (INLINE_TEST___inline__) --- > SET(HDF5_EXTRA_TEST_DEFINITIONS INLINE_TEST_INLINE) > FOREACH(inline_test inline __inline__ __inline) > SET(INLINE_TEST_INLINE ${inline_test}) > HDF5_FUNCTION_TEST(INLINE_TEST_${inline_test}) > ENDFOREACH(inline_test) > SET(HDF5_EXTRA_TEST_DEFINITIONS) > IF(INLINE_TEST___inline__) > SET(H5_inline __inline__) > ELSE(INLINE_TEST___inline__) > IF(INLINE_TEST___inline) > SET(H5_inline __inline) > ELSE(INLINE_TEST___inline) > IF(INLINE_TEST_inline) > SET(H5_inline inline) > ENDIF(INLINE_TEST_inline) > ENDIF(INLINE_TEST___inline) > ENDIF(INLINE_TEST___inline__) 552c521 < SET (H5_H5_PRINTF_LL_WIDTH "H5_PRINTF_LL_WIDTH") --- > SET(H5_H5_PRINTF_LL_WIDTH "H5_PRINTF_LL_WIDTH") 554,557c523,526 < SET (PRINT_LL_FOUND 0) < MESSAGE (STATUS "Checking for appropriate format for 64 bit long:") < FOREACH (HDF5_PRINTF_LL l64 l L q I64 ll) < SET (CURRENT_TEST_DEFINITIONS "-DPRINTF_LL_WIDTH=${HDF5_PRINTF_LL}") --- > SET(PRINT_LL_FOUND 0) > MESSAGE(STATUS "Checking for appropriate format for 64 bit long:") > FOREACH(HDF5_PRINTF_LL l64 l L q I64 ll) > SET(CURRENT_TEST_DEFINITIONS "-DPRINTF_LL_WIDTH=${HDF5_PRINTF_LL}") 559c528 < SET (CURRENT_TEST_DEFINITIONS "${CURRENT_TEST_DEFINITIONS} -DHAVE_LONG_LONG") --- > SET(CURRENT_TEST_DEFINITIONS "${CURRENT_TEST_DEFINITIONS} -DHAVE_LONG_LONG") 561,566c530,534 < TRY_RUN (HDF5_PRINTF_LL_TEST_RUN HDF5_PRINTF_LL_TEST_COMPILE < ${HDF5_BINARY_DIR}/CMake < ${HDF5_SOURCE_DIR}/Resources/HDF5Tests.c < CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${CURRENT_TEST_DEFINITIONS} < OUTPUT_VARIABLE OUTPUT < ) --- > TRY_RUN(HDF5_PRINTF_LL_TEST_RUN HDF5_PRINTF_LL_TEST_COMPILE > ${HDF5_BINARY_DIR}/CMake > ${HDF5_SOURCE_DIR}/Resources/HDF5Tests.c > CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${CURRENT_TEST_DEFINITIONS} > OUTPUT_VARIABLE OUTPUT) 569,570c537,538 < SET (H5_PRINTF_LL_WIDTH "\"${HDF5_PRINTF_LL}\"" CACHE INTERNAL "Width for printf for type `long long' or `__int64', us. `ll") < SET (PRINT_LL_FOUND 1) --- > SET(H5_PRINTF_LL_WIDTH "\"${HDF5_PRINTF_LL}\"" CACHE INTERNAL "Width for printf for type `long long' or `__int64', us. `ll") > SET(PRINT_LL_FOUND 1) 572c540 < MESSAGE ("Width with ${HDF5_PRINTF_LL} failed with result: ${HDF5_PRINTF_LL_TEST_RUN}") --- > MESSAGE("Width with ${HDF5_PRINTF_LL} failed with result: ${HDF5_PRINTF_LL_TEST_RUN}") 575,577c543,544 < FILE (APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log < "Test H5_PRINTF_LL_WIDTH for ${HDF5_PRINTF_LL} failed with the following output:\n ${OUTPUT}\n" < ) --- > FILE( APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log > "Test H5_PRINTF_LL_WIDTH for ${HDF5_PRINTF_LL} failed with the following output:\n ${OUTPUT}\n") 579,580c546 < ENDFOREACH (HDF5_PRINTF_LL) < --- > ENDFOREACH(HDF5_PRINTF_LL) 582c548 < MESSAGE (STATUS "Checking for apropriate format for 64 bit long: found ${H5_PRINTF_LL_WIDTH}") --- > MESSAGE(STATUS "Checking for apropriate format for 64 bit long: found ${H5_PRINTF_LL_WIDTH}") 584,587c550,552 < MESSAGE (STATUS "Checking for apropriate format for 64 bit long: not found") < SET (H5_PRINTF_LL_WIDTH "\"unknown\"" CACHE INTERNAL < "Width for printf for type `long long' or `__int64', us. `ll" < ) --- > MESSAGE(STATUS "Checking for apropriate format for 64 bit long: not found") > SET(H5_PRINTF_LL_WIDTH "\"unknown\"" CACHE INTERNAL > "Width for printf for type `long long' or `__int64', us. `ll") 591,597c556,559 < # ---------------------------------------------------------------------- < # Set the flag to indicate that the machine can handle converting < # denormalized floating-point values. < # (This flag should be set for all machines, except for the Crays, where < # the cache value is set in it's config file) < # < SET (H5_CONVERT_DENORMAL_FLOAT 1) --- > #----------------------------------------------------------------------------- > # Some things that are always true > #----------------------------------------------------------------------------- > SET(H5_CONVERT_DENORMAL_FLOAT 1) 603c565 < SET (H5_HAVE_LARGE_HSIZET 1) --- > SET(H5_HAVE_LARGE_HSIZET 1) 606c568 < SET (H5_HAVE_LSEEK64 0) --- > SET(H5_HAVE_LSEEK64 0) 612,623c574,584 < MACRO (H5ConversionTests TEST msg) < IF ("${TEST}" MATCHES "^${TEST}$") < # MESSAGE (STATUS "===> ${TEST}") < TRY_RUN (${TEST}_RUN ${TEST}_COMPILE < ${HDF5_BINARY_DIR}/CMake < ${HDF5_SOURCE_DIR}/Resources/ConversionTests.c < CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=-D${TEST}_TEST < OUTPUT_VARIABLE OUTPUT < ) < IF (${TEST}_COMPILE) < IF (${TEST}_RUN MATCHES 0) < SET (${TEST} 1 CACHE INTERNAL ${msg}) --- > MACRO ( H5ConversionTests TEST msg) > IF("${TEST}" MATCHES "^${TEST}$") > # MESSAGE(STATUS "===> ${TEST}") > TRY_RUN(${TEST}_RUN ${TEST}_COMPILE > ${HDF5_BINARY_DIR}/CMake > ${HDF5_SOURCE_DIR}/Resources/ConversionTests.c > CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=-D${TEST}_TEST > OUTPUT_VARIABLE OUTPUT) > IF ( ${TEST}_COMPILE ) > IF ( ${TEST}_RUN MATCHES 0) > SET( ${TEST} 1 CACHE INTERNAL ${msg}) 625,639c586,598 < ELSE (${TEST}_RUN MATCHES 0) < SET (${TEST} "" CACHE INTERNAL ${msg}) < MESSAGE (STATUS "${msg}... no") < FILE (APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log < "Test ${TEST} Run failed with the following output and exit code:\n ${OUTPUT}\n" < ) < ENDIF (${TEST}_RUN MATCHES 0) < ELSE (${TEST}_COMPILE ) < SET (${TEST} "" CACHE INTERNAL ${msg}) < MESSAGE (STATUS "${msg}... no") < FILE (APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log < "Test ${TEST} Compile failed with the following output:\n ${OUTPUT}\n" < ) < ENDIF (${TEST}_COMPILE) < --- > ELSE () > SET( ${TEST} "" CACHE INTERNAL ${msg}) > MESSAGE(STATUS "${msg}... no") > FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log > "Test ${TEST} Run failed with the following output and exit code:\n ${OUTPUT}\n") > ENDIF () > ELSE ( ${TEST}_COMPILE ) > SET( ${TEST} "" CACHE INTERNAL ${msg}) > MESSAGE(STATUS "${msg}... no") > FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log > "Test ${TEST} Compile failed with the following output:\n ${OUTPUT}\n" ) > ENDIF ( ${TEST}_COMPILE) > 641c600 < ENDMACRO (H5ConversionTests) --- > ENDMACRO ( H5ConversionTests TEST msg) 646,656c605,615 < MACRO (H5MiscConversionTest VAR TEST msg) < IF ("${TEST}" MATCHES "^${TEST}$") < IF (${VAR}) < SET (${TEST} 1 CACHE INTERNAL ${msg}) < MESSAGE (STATUS "${msg}... yes") < ELSE (${VAR}) < SET (${TEST} "" CACHE INTERNAL ${msg}) < MESSAGE (STATUS "${msg}... no") < ENDIF (${VAR}) < ENDIF ("${TEST}" MATCHES "^${TEST}$") < ENDMACRO (H5MiscConversionTest) --- > MACRO(H5MiscConversionTest VAR TEST msg) > IF ( "${TEST}" MATCHES "^${TEST}$") > IF ( ${VAR}) > SET(${TEST} 1 CACHE INTERNAL ${msg} ) > MESSAGE(STATUS "${msg}... yes") > else() > SET(${TEST} "" CACHE INTERNAL ${msg} ) > MESSAGE(STATUS "${msg}... no") > ENDIF() > ENDIF() > ENDMACRO(H5MiscConversionTest VAR TEST msg) 661,779c620,643 < < # ----------------------------------------------------------------------- < # Set flag to indicate that the machine can handle conversion from < # long double to integers accurately. This flag should be set "yes" for < # all machines except all SGIs. For SGIs, some conversions are < # incorrect and its cache value is set "no" in its config/irix6.x and < # irix5.x. < # < H5MiscConversionTest (H5_SIZEOF_LONG_DOUBLE H5_LDOUBLE_TO_INTEGER_ACCURATE "checking IF converting from long double to integers is accurate") < # ----------------------------------------------------------------------- < # Set flag to indicate that the machine can do conversion from < # long double to integers regardless of accuracy. This flag should be < # set "yes" for all machines except HP-UX 11.00. For HP-UX 11.00, the < # compiler has 'floating exception' when converting 'long double' to all < # integers except 'unsigned long long'. Other HP-UX systems are unknown < # yet. (1/8/05 - SLU) < # < H5ConversionTests (H5_LDOUBLE_TO_INTEGER_WORKS "Checking IF converting from long double to integers works") < # ----------------------------------------------------------------------- < # Set flag to indicate that the machine can handle conversion from < # integers to long double. (This flag should be set "yes" for all < # machines except all SGIs, where some conversions are < # incorrect and its cache value is set "no" in its config/irix6.x and < # irix5.x) < # < H5MiscConversionTest (H5_SIZEOF_LONG_DOUBLE H5_INTEGER_TO_LDOUBLE_ACCURATE "checking IF accurately converting from integers to long double") < # ---------------------------------------------------------------------- < # Set the flag to indicate that the machine can accurately convert < # 'unsigned long' to 'float' values. < # (This flag should be set for all machines, except for Pathscale compiler < # on Sandia's Linux machine where the compiler interprets 'unsigned long' < # values as negative when the first bit of 'unsigned long' is on during < # the conversion to float.) < # < H5ConversionTests (H5_ULONG_TO_FLOAT_ACCURATE "Checking IF accurately converting unsigned long to float values") < # ---------------------------------------------------------------------- < # Set the flag to indicate that the machine can accurately convert < # 'unsigned (long) long' values to 'float' and 'double' values. < # (This flag should be set for all machines, except for the SGIs, where < # the cache value is set in the config/irix6.x config file) and Solaris < # 64-bit machines, where the short program below tests if round-up is < # correctly handled. < # < H5ConversionTests (H5_ULONG_TO_FP_BOTTOM_BIT_ACCURATE "Checking IF accurately converting unsigned long long to floating-point values") < # ---------------------------------------------------------------------- < # Set the flag to indicate that the machine can accurately convert < # 'float' or 'double' to 'unsigned long long' values. < # (This flag should be set for all machines, except for PGI compiler < # where round-up happens when the fraction of float-point value is greater < # than 0.5. < # < H5ConversionTests (H5_FP_TO_ULLONG_ACCURATE "Checking IF accurately roundup converting floating-point to unsigned long long values" ) < # ---------------------------------------------------------------------- < # Set the flag to indicate that the machine can accurately convert < # 'float', 'double' or 'long double' to 'unsigned long long' values. < # (This flag should be set for all machines, except for HP-UX machines < # where the maximal number for unsigned long long is 0x7fffffffffffffff < # during conversion. < # < H5ConversionTests (H5_FP_TO_ULLONG_RIGHT_MAXIMUM "Checking IF right maximum converting floating-point to unsigned long long values" ) < # ---------------------------------------------------------------------- < # Set the flag to indicate that the machine can accurately convert < # 'long double' to 'unsigned int' values. (This flag should be set for < # all machines, except for some Intel compilers on some Linux.) < # < H5ConversionTests (H5_LDOUBLE_TO_UINT_ACCURATE "Checking IF correctly converting long double to unsigned int values") < # ---------------------------------------------------------------------- < # Set the flag to indicate that the machine can _compile_ < # 'unsigned long long' to 'float' and 'double' typecasts. < # (This flag should be set for all machines.) < # < IF (H5_ULLONG_TO_FP_CAST_WORKS MATCHES ^H5_ULLONG_TO_FP_CAST_WORKS$) < SET (H5_ULLONG_TO_FP_CAST_WORKS 1 CACHE INTERNAL "Checking IF compiling unsigned long long to floating-point typecasts work") < MESSAGE (STATUS "Checking IF compiling unsigned long long to floating-point typecasts work... yes") < ENDIF (H5_ULLONG_TO_FP_CAST_WORKS MATCHES ^H5_ULLONG_TO_FP_CAST_WORKS$) < # ---------------------------------------------------------------------- < # Set the flag to indicate that the machine can _compile_ < # 'long long' to 'float' and 'double' typecasts. < # (This flag should be set for all machines.) < # < IF (H5_LLONG_TO_FP_CAST_WORKS MATCHES ^H5_LLONG_TO_FP_CAST_WORKS$) < SET (H5_LLONG_TO_FP_CAST_WORKS 1 CACHE INTERNAL "Checking IF compiling long long to floating-point typecasts work") < MESSAGE (STATUS "Checking IF compiling long long to floating-point typecasts work... yes") < ENDIF (H5_LLONG_TO_FP_CAST_WORKS MATCHES ^H5_LLONG_TO_FP_CAST_WORKS$) < # ---------------------------------------------------------------------- < # Set the flag to indicate that the machine can convert from < # 'unsigned long long' to 'long double' without precision loss. < # (This flag should be set for all machines, except for FreeBSD(sleipnir) < # where the last 2 bytes of mantissa are lost when compiler tries to do < # the conversion, and Cygwin where compiler doesn't do rounding correctly.) < # < H5ConversionTests (H5_ULLONG_TO_LDOUBLE_PRECISION "Checking IF converting unsigned long long to long double with precision") < # ---------------------------------------------------------------------- < # Set the flag to indicate that the machine can handle overflow converting < # all floating-point to all integer types. < # (This flag should be set for all machines, except for Cray X1 where < # floating exception is generated when the floating-point value is greater < # than the maximal integer value). < # < H5ConversionTests (H5_FP_TO_INTEGER_OVERFLOW_WORKS "Checking IF overflows normally converting floating-point to integer values") < # ---------------------------------------------------------------------- < # Set the flag to indicate that the machine can accurately convert < # 'long double' to '(unsigned) long long' values. (This flag should be set for < # all machines, except for Mac OS 10.4 and SGI IRIX64 6.5. When the bit sequence < # of long double is 0x4351ccf385ebc8a0bfcc2a3c..., the values of (unsigned)long long < # start to go wrong on these two machines. Adjusting it higher to < # 0x4351ccf385ebc8a0dfcc... or 0x4351ccf385ebc8a0ffcc... will make the converted < # values wildly wrong. This test detects this wrong behavior and disable the test. < # < H5ConversionTests (H5_LDOUBLE_TO_LLONG_ACCURATE "Checking IF correctly converting long double to (unsigned) long long values") < # ---------------------------------------------------------------------- < # Set the flag to indicate that the machine can accurately convert < # '(unsigned) long long' to 'long double' values. (This flag should be set for < # all machines, except for Mac OS 10.4, when the bit sequences are 003fff..., < # 007fff..., 00ffff..., 01ffff..., ..., 7fffff..., the converted values are twice < # as big as they should be. < # < H5ConversionTests (H5_LLONG_TO_LDOUBLE_CORRECT "Checking IF correctly converting (unsigned) long long to long double values") < H5ConversionTests (H5_NO_ALIGNMENT_RESTRICTIONS "Checking IF alignment restrictions are strictly enforced") --- > H5MiscConversionTest( H5_SIZEOF_LONG_DOUBLE H5_LDOUBLE_TO_INTEGER_ACCURATE "checking IF converting from long double to integers is accurate") > H5ConversionTests( H5_LDOUBLE_TO_INTEGER_WORKS "Checking IF converting from long double to integers works") > H5MiscConversionTest( H5_SIZEOF_LONG_DOUBLE H5_INTEGER_TO_LDOUBLE_ACCURATE "checking IF accurately converting from integers to long double") > H5ConversionTests( H5_ULONG_TO_FLOAT_ACCURATE "Checking IF accurately converting unsigned long to float values") > H5ConversionTests( H5_ULONG_TO_FP_BOTTOM_BIT_ACCURATE "Checking IF accurately converting unsigned long long to floating-point values") > H5ConversionTests( H5_FP_TO_ULLONG_ACCURATE "Checking IF accurately roundup converting floating-point to unsigned long long values" ) > H5ConversionTests( H5_FP_TO_ULLONG_RIGHT_MAXIMUM "Checking IF right maximum converting floating-point to unsigned long long values" ) > H5ConversionTests( H5_LDOUBLE_TO_UINT_ACCURATE "Checking IF correctly converting long double to unsigned int values") > > IF ( H5_ULLONG_TO_FP_CAST_WORKS MATCHES ^H5_ULLONG_TO_FP_CAST_WORKS$) > SET (H5_ULLONG_TO_FP_CAST_WORKS 1 CACHE INTERNAL "Checking IF compiling unsigned long long to floating-point typecasts work") > MESSAGE(STATUS "Checking IF compiling unsigned long long to floating-point typecasts work... yes") > ENDIF() > > IF ( H5_INTEGER_TO_LDOUBLE_ACCURATE MATCHES ^H5_INTEGER_TO_LDOUBLE_ACCURATE$) > SET (H5_LLONG_TO_FP_CAST_WORKS 1 CACHE INTERNAL "Checking IF compiling long long to floating-point typecasts work") > MESSAGE(STATUS "Checking IF compiling long long to floating-point typecasts work... yes") > ENDIF() > > H5ConversionTests( H5_ULLONG_TO_LDOUBLE_PRECISION "Checking IF converting unsigned long long to long double with precision") > H5ConversionTests( H5_FP_TO_INTEGER_OVERFLOW_WORKS "Checking IF overflows normally converting floating-point to integer values") > H5ConversionTests( H5_LDOUBLE_TO_LLONG_ACCURATE "Checking IF correctly converting long double to (unsigned) long long values") > H5ConversionTests( H5_LLONG_TO_LDOUBLE_CORRECT "Checking IF correctly converting (unsigned) long long to long double values") > H5ConversionTests( H5_NO_ALIGNMENT_RESTRICTIONS "Checking IF alignment restrictions are strictly enforced") 787,788c651,652 < SET (H5_FP_TO_ULLONG_RIGHT_MAXIMUM "" CACHE INTERNAL "") < ENDIF (WINDOWS) --- > SET(H5_FP_TO_ULLONG_RIGHT_MAXIMUM "" CACHE INTERNAL "") > ENDIF() diff -r Cmake-1.8.5-contrib/CTestConfig.cmake Cmake-initial-contrib/CTestConfig.cmake 7,8c7,8 < set(CTEST_PROJECT_NAME "HDF5.1.8") < set(CTEST_NIGHTLY_START_TIME "20:00:00 CST") --- > set(CTEST_PROJECT_NAME "HDF5-1.8") > set(CTEST_NIGHTLY_START_TIME "00:00:00 EST") 11,12c11,12 < set(CTEST_DROP_SITE "nei.hdfgroup.uiuc.edu") < set(CTEST_DROP_LOCATION "/cdash/submit.php?project=HDF5.1.8") --- > set(CTEST_DROP_SITE "cdash.cscs.ch") > set(CTEST_DROP_LOCATION "/submit.php?project=HDF5-1.8") 14,15d13 < < set(UPDATE_TYPE svn) Only in Cmake-1.8.5-contrib/examples: CMakeLists.txt diff -r Cmake-1.8.5-contrib/fortran/CMakeLists.txt Cmake-initial-contrib/fortran/CMakeLists.txt 1,2c1 < cmake_minimum_required (VERSION 2.8) < PROJECT (HDF5_F90 C CXX Fortran) --- > PROJECT(HDF5_F90 C CXX Fortran) 5c4 < # Detect name mangling convention used between Fortran and C --- > # Setup output Directories 7,13c6,21 < INCLUDE (FortranCInterface) < FortranCInterface_HEADER ( < ${HDF5_F90_BINARY_DIR}/FCMangle.h < MACRO_NAMESPACE "H5_FC_" < SYMBOL_NAMESPACE "H5_FC_" < SYMBOLS mysub mymod:my_sub < ) --- > IF(NOT HDF5_EXTERNALLY_CONFIGURED) > SET (CMAKE_RUNTIME_OUTPUT_DIRECTORY > ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all Executables." > ) > SET (CMAKE_LIBRARY_OUTPUT_DIRECTORY > ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all Libraries" > ) > SET (CMAKE_ARCHIVE_OUTPUT_DIRECTORY > ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all static libraries." > ) > ENDIF(NOT HDF5_EXTERNALLY_CONFIGURED) > > #----------------------------------------------------------------------------- > # Fortran support is best served using cmake 2.8.0 > #----------------------------------------------------------------------------- > cmake_minimum_required(VERSION 2.8) 15,21c23,38 < FILE (STRINGS ${HDF5_F90_BINARY_DIR}/FCMangle.h CONTENTS REGEX "H5_FC_GLOBAL\\(.*,.*\\) +(.*)") < STRING (REGEX MATCH "H5_FC_GLOBAL\\(.*,.*\\) +(.*)" RESULT ${CONTENTS}) < SET (H5_FC_FUNC "H5_FC_FUNC(name,NAME) ${CMAKE_MATCH_1}" PARENT_SCOPE) < < FILE (STRINGS ${HDF5_F90_BINARY_DIR}/FCMangle.h CONTENTS REGEX "H5_FC_GLOBAL_\\(.*,.*\\) +(.*)") < STRING (REGEX MATCH "H5_FC_GLOBAL_\\(.*,.*\\) +(.*)" RESULT ${CONTENTS}) < SET (H5_FC_FUNC_ "H5_FC_FUNC_(name,NAME) ${CMAKE_MATCH_1}" PARENT_SCOPE) --- > #----------------------------------------------------------------------------- > # Detect name mangling convention used between Fortran and C > #----------------------------------------------------------------------------- > include(FortranCInterface) > FortranCInterface_HEADER(${HDF5_F90_BINARY_DIR}/FCMangle.h > MACRO_NAMESPACE "H5_FC_" > SYMBOL_NAMESPACE "H5_FC_" > SYMBOLS mysub mymod:my_sub) > > FILE(STRINGS ${HDF5_F90_BINARY_DIR}/FCMangle.h CONTENTS REGEX "H5_FC_GLOBAL\\(.*,.*\\) +(.*)") > STRING(REGEX MATCH "H5_FC_GLOBAL\\(.*,.*\\) +(.*)" RESULT ${CONTENTS}) > SET(H5_FC_FUNC "H5_FC_FUNC(name,NAME) ${CMAKE_MATCH_1}" PARENT_SCOPE) > > FILE(STRINGS ${HDF5_F90_BINARY_DIR}/FCMangle.h CONTENTS REGEX "H5_FC_GLOBAL_\\(.*,.*\\) +(.*)") > STRING(REGEX MATCH "H5_FC_GLOBAL_\\(.*,.*\\) +(.*)" RESULT ${CONTENTS}) > SET(H5_FC_FUNC_ "H5_FC_FUNC_(name,NAME) ${CMAKE_MATCH_1}" PARENT_SCOPE) 27,38c44,55 < MACRO (CHECK_FORTRAN_FEATURE FUNCTION CODE VARIABLE) < IF (NOT DEFINED ${VARIABLE}) < MESSAGE (STATUS "Testing Fortran ${FUNCTION}") < IF (CMAKE_REQUIRED_LIBRARIES) < SET (CHECK_FUNCTION_EXISTS_ADD_LIBRARIES < "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}") < ELSE (CMAKE_REQUIRED_LIBRARIES) < SET (CHECK_FUNCTION_EXISTS_ADD_LIBRARIES) < ENDIF (CMAKE_REQUIRED_LIBRARIES) < FILE (WRITE < ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testFortranCompiler.f < "${CODE}" --- > macro(CHECK_FORTRAN_FEATURE FUNCTION CODE VARIABLE) > if(NOT DEFINED ${VARIABLE}) > message(STATUS "Testing Fortran ${FUNCTION}") > if(CMAKE_REQUIRED_LIBRARIES) > set(CHECK_FUNCTION_EXISTS_ADD_LIBRARIES > "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}") > else(CMAKE_REQUIRED_LIBRARIES) > set(CHECK_FUNCTION_EXISTS_ADD_LIBRARIES) > endif(CMAKE_REQUIRED_LIBRARIES) > FILE(WRITE > ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testFortranCompiler.f > "${CODE}" 40,44c57,61 < TRY_COMPILE (${VARIABLE} < ${CMAKE_BINARY_DIR} < ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testFortranCompiler.f < CMAKE_FLAGS "${CHECK_FUNCTION_EXISTS_ADD_LIBRARIES}" < OUTPUT_VARIABLE OUTPUT --- > try_compile(${VARIABLE} > ${CMAKE_BINARY_DIR} > ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testFortranCompiler.f > CMAKE_FLAGS "${CHECK_FUNCTION_EXISTS_ADD_LIBRARIES}" > OUTPUT_VARIABLE OUTPUT 47,66c64,82 < # MESSAGE ( "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * ") < # MESSAGE ( "Test result ${OUTPUT}") < # MESSAGE ( "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * ") < < IF (${VARIABLE}) < SET (${VARIABLE} 1 CACHE INTERNAL "Have Fortran function ${FUNCTION}") < MESSAGE (STATUS "Testing Fortran ${FUNCTION} - OK") < FILE (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log < "Determining if the Fortran ${FUNCTION} exists passed with the following output:\n" < "${OUTPUT}\n\n" < ) < ELSE (${VARIABLE}) < MESSAGE (STATUS "Testing Fortran ${FUNCTION} - Fail") < SET (${VARIABLE} "" CACHE INTERNAL "Have Fortran function ${FUNCTION}") < FILE (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log < "Determining if the Fortran ${FUNCTION} exists failed with the following output:\n" < "${OUTPUT}\n\n") < ENDIF (${VARIABLE}) < ENDIF (NOT DEFINED ${VARIABLE}) < ENDMACRO (CHECK_FORTRAN_FEATURE) --- > # MESSAGE( "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * ") > # MESSAGE( "Test result ${OUTPUT}") > # MESSAGE( "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * ") > > if(${VARIABLE}) > set(${VARIABLE} 1 CACHE INTERNAL "Have Fortran function ${FUNCTION}") > message(STATUS "Testing Fortran ${FUNCTION} - OK") > file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log > "Determining if the Fortran ${FUNCTION} exists passed with the following output:\n" > "${OUTPUT}\n\n") > else(${VARIABLE}) > message(STATUS "Testing Fortran ${FUNCTION} - Fail") > set(${VARIABLE} "" CACHE INTERNAL "Have Fortran function ${FUNCTION}") > file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log > "Determining if the Fortran ${FUNCTION} exists failed with the following output:\n" > "${OUTPUT}\n\n") > endif(${VARIABLE}) > endif(NOT DEFINED ${VARIABLE}) > endmacro(CHECK_FORTRAN_FEATURE) 75c91 < CHECK_FORTRAN_FEATURE(sizeof --- > CHECK_FORTRAN_FEATURE(sizeof 78c94 < i = sizeof(x) --- > i = sizeof(x) 80c96 < " --- > " 82c98 < ) --- > ) 84c100 < CHECK_FORTRAN_FEATURE(RealIsNotDouble --- > CHECK_FORTRAN_FEATURE(RealIsNotDouble 87c103 < INTERFACE h5t --- > INTERFACE h5t 106c122 < " --- > " 108,126c124 < ) < < #----------------------------------------------------------------------------- < # Make sure generated files and modules are picked up correctly < #----------------------------------------------------------------------------- < INCLUDE_DIRECTORIES( < ${CMAKE_Fortran_MODULE_DIRECTORY} < ${HDF5_F90_BINARY_DIR} < ) < < #----------------------------------------------------------------------------- < # Add debug information (intel Fortran : JB) < #----------------------------------------------------------------------------- < IF (CMAKE_Fortran_COMPILER MATCHES ifort) < IF (WIN32) < SET (CMAKE_Fortran_FLAGS_DEBUG "/debug:full /dbglibs " CACHE "flags" STRING FORCE) < SET (CMAKE_EXE_LINKER_FLAGS_DEBUG "/DEBUG" CACHE "flags" STRING FORCE) < ENDIF (WIN32) < ENDIF (CMAKE_Fortran_COMPILER MATCHES ifort) --- > ) 131c129 < ADD_SUBDIRECTORY (${HDF5_F90_SOURCE_DIR}/src ${HDF5_F90_BINARY_DIR}/src) --- > SET(FORTRAN_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src) 141c139,195 < # Build the Fortran Examples --- > # Auto-generated files will be placed and included from here > #----------------------------------------------------------------------------- > INCLUDE_DIRECTORIES(${HDF5_F90_BINARY_DIR}) > > #----------------------------------------------------------------------------- > # Setup the Fortran auto-detection utilities > # H5test_kind(_SIZEOF).f90 used to generate H5fortran_detect.f90 > # H5fortran_detect.f90 used to generate H5fort_type_defines.h > # H5fort_type_defines.h used to generate H5f90i_gen.h + H5fortran_types.f90 > #----------------------------------------------------------------------------- > IF (FORTRAN_HAVE_SIZEOF) > ADD_EXECUTABLE(H5test_FortranHavekind > ${FORTRAN_SRC_DIR}/H5test_kind_SIZEOF.f90 > ) > ELSE (FORTRAN_HAVE_SIZEOF) > ADD_EXECUTABLE(H5test_FortranHavekind > ${FORTRAN_SRC_DIR}/H5test_kind.f90 > ) > ENDIF (FORTRAN_HAVE_SIZEOF) > > SET (CMD ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}${CFG_INIT}/H5test_FortranHavekind${EXE_EXT}) > ADD_CUSTOM_COMMAND( > OUTPUT ${HDF5_F90_BINARY_DIR}/H5fortran_detect.f90 > COMMAND ${CMD} > ARGS > ${HDF5_F90_BINARY_DIR}/H5fortran_detect.f90 > WORKING_DIRECTORY ${HDF5_F90_BINARY_DIR} > DEPENDS H5test_FortranHavekind > ) > #----------------------------------------------------------------------------- > ADD_EXECUTABLE(H5fortran_detect > ${HDF5_F90_BINARY_DIR}/H5fortran_detect.f90 > ) > > SET (CMD ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}${CFG_INIT}/H5fortran_detect${EXE_EXT}) > ADD_CUSTOM_COMMAND( > OUTPUT ${HDF5_F90_BINARY_DIR}/H5fort_type_defines.h > COMMAND ${CMD} > ARGS > ${HDF5_F90_BINARY_DIR}/H5fort_type_defines.h > WORKING_DIRECTORY ${HDF5_F90_BINARY_DIR} > DEPENDS H5fortran_detect > ) > > #----------------------------------------------------------------------------- > ADD_EXECUTABLE(H5match_types > ${HDF5_F90_BINARY_DIR}/H5fort_type_defines.h > ${FORTRAN_SRC_DIR}/H5match_types.c > ) > > SET (CMD ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}${CFG_INIT}/H5match_types${EXE_EXT}) > ADD_CUSTOM_COMMAND( > OUTPUT ${HDF5_F90_BINARY_DIR}/H5f90i_gen.h > ${HDF5_F90_BINARY_DIR}/H5fortran_types.f90 > COMMAND ${CMD} > WORKING_DIRECTORY ${HDF5_F90_BINARY_DIR} > DEPENDS H5match_types > ) > 143,145c197,314 < IF (HDF5_BUILD_EXAMPLES) < ADD_SUBDIRECTORY (${HDF5_F90_SOURCE_DIR}/examples ${HDF5_F90_BINARY_DIR}/examples) < ENDIF (HDF5_BUILD_EXAMPLES) --- > # f90CStub lib > #----------------------------------------------------------------------------- > SET(f90CStub_C_SRCS > # generated files > ${HDF5_F90_BINARY_DIR}/H5f90i_gen.h > > # normal distribution > ${FORTRAN_SRC_DIR}/H5f90kit.c > ${FORTRAN_SRC_DIR}/H5_f.c > ${FORTRAN_SRC_DIR}/H5Af.c > ${FORTRAN_SRC_DIR}/H5Df.c > ${FORTRAN_SRC_DIR}/H5Ef.c > ${FORTRAN_SRC_DIR}/H5Ff.c > ${FORTRAN_SRC_DIR}/H5Gf.c > ${FORTRAN_SRC_DIR}/H5If.c > ${FORTRAN_SRC_DIR}/H5Lf.c > ${FORTRAN_SRC_DIR}/H5Of.c > ${FORTRAN_SRC_DIR}/H5Pf.c > ${FORTRAN_SRC_DIR}/H5Rf.c > ${FORTRAN_SRC_DIR}/H5Sf.c > ${FORTRAN_SRC_DIR}/H5Tf.c > ${FORTRAN_SRC_DIR}/H5Zf.c > ) > > IF (H5_HAVE_PARALLEL) > SET (f90CStub_C_SRCS > ${f90CStub_C_SRCS} > ${FORTRAN_SRC_DIR}/H5FDmpiof.c > ) > ENDIF (H5_HAVE_PARALLEL) > > SET_SOURCE_FILES_PROPERTIES( ${f90CStub_C_SRCS} PROPERTIES LANGUAGE C) > > ADD_LIBRARY(${HDF5_F90_C_LIB_NAME} ${f90CStub_C_SRCS} ) > TARGET_LINK_LIBRARIES(${HDF5_F90_C_LIB_NAME} hdf5) > > #----------------------------------------------------------------------------- > # Fortran Real Size > #----------------------------------------------------------------------------- > IF (FORTRAN_DEFAULT_REAL_NOT_DOUBLE) > # default real is 4 bytes, so include double signatures > SET (F_DBLE "Include") > ELSE (FORTRAN_DEFAULT_REAL_NOT_DOUBLE) > # default real is 8 bytes, so exclude double signatures > SET (F_DBLE "Exclude") > ENDIF (FORTRAN_DEFAULT_REAL_NOT_DOUBLE) > > #----------------------------------------------------------------------------- > # Fortran Modules > #----------------------------------------------------------------------------- > IF (H5_HAVE_PARALLEL) > SET (H5FC_NAME h5pfc) > ELSE (H5_HAVE_PARALLEL) > SET (H5FC_NAME h5fc) > ENDIF (H5_HAVE_PARALLEL) > > #----------------------------------------------------------------------------- > ADD_LIBRARY(H5FORTRAN_TYPES STATIC ${HDF5_F90_BINARY_DIR}/H5fortran_types.f90 ) > ADD_LIBRARY(H5GLOBAL STATIC ${FORTRAN_SRC_DIR}/H5f90global.f90 ) > ADD_LIBRARY(H5LIB STATIC ${FORTRAN_SRC_DIR}/H5_ff.f90 ) > ADD_LIBRARY(H5_DBLE_INTERFACE STATIC ${FORTRAN_SRC_DIR}/H5_DBLE_Interface${F_DBLE}.f90 ) > ADD_LIBRARY(H5A STATIC ${FORTRAN_SRC_DIR}/H5Aff.f90 ) > ADD_LIBRARY(H5D STATIC ${FORTRAN_SRC_DIR}/H5Dff.f90 ) > ADD_LIBRARY(H5E STATIC ${FORTRAN_SRC_DIR}/H5Eff.f90 ) > ADD_LIBRARY(H5F STATIC ${FORTRAN_SRC_DIR}/H5Fff.f90 ) > ADD_LIBRARY(H5G STATIC ${FORTRAN_SRC_DIR}/H5Gff.f90 ) > ADD_LIBRARY(H5I STATIC ${FORTRAN_SRC_DIR}/H5Iff.f90 ) > ADD_LIBRARY(H5L STATIC ${FORTRAN_SRC_DIR}/H5Lff.f90 ) > ADD_LIBRARY(H5O STATIC ${FORTRAN_SRC_DIR}/H5Off.f90 ) > ADD_LIBRARY(H5P STATIC ${FORTRAN_SRC_DIR}/H5Pff.f90 ) > ADD_LIBRARY(H5R STATIC ${FORTRAN_SRC_DIR}/H5Rff.f90 ) > ADD_LIBRARY(H5S STATIC ${FORTRAN_SRC_DIR}/H5Sff.f90 ) > ADD_LIBRARY(H5T STATIC ${FORTRAN_SRC_DIR}/H5Tff.f90 ) > ADD_LIBRARY(H5Z STATIC ${FORTRAN_SRC_DIR}/H5Zff.f90 ) > #----------------------------------------------------------------------------- > # Force dependencies between libs to ensure build order is ok > #----------------------------------------------------------------------------- > add_dependencies(H5A H5GLOBAL) > add_dependencies(H5D H5GLOBAL) > add_dependencies(H5E H5GLOBAL) > add_dependencies(H5F H5GLOBAL) > add_dependencies(H5G H5GLOBAL) > add_dependencies(H5I H5GLOBAL) > add_dependencies(H5L H5GLOBAL) > add_dependencies(H5O H5GLOBAL) > add_dependencies(H5P H5GLOBAL) > add_dependencies(H5R H5GLOBAL) > add_dependencies(H5S H5GLOBAL) > add_dependencies(H5T H5GLOBAL) > add_dependencies(H5Z H5GLOBAL) > add_dependencies(H5GLOBAL H5FORTRAN_TYPES) > add_dependencies(H5LIB H5GLOBAL) > add_dependencies(H5_DBLE_INTERFACE H5GLOBAL) > add_dependencies(H5_DBLE_INTERFACE H5A H5D H5P) > #----------------------------------------------------------------------------- > IF (H5_HAVE_PARALLEL) > ADD_LIBRARY(H5FDMPIO STATIC ${FORTRAN_SRC_DIR}/H5FDmpioff.f90 ) > add_dependencies(H5FDMPIO H5GLOBAL) > SET (HDF5MODULE_SRC > ${FORTRAN_SRC_DIR}/HDF5mpio.f90 > ) > SET (HDF5_DEPENDS H5FDMPIO) > ELSE (H5_HAVE_PARALLEL) > SET (HDF5MODULE_SRC > ${FORTRAN_SRC_DIR}/HDF5.f90 > ) > SET (HDF5_DEPENDS "") > ENDIF (H5_HAVE_PARALLEL) > #----------------------------------------------------------------------------- > ADD_LIBRARY(${HDF5_F90_LIB_NAME} STATIC ${HDF5MODULE_SRC} ) > SET_GLOBAL_VARIABLE(HDF5_LIBRARIES_TO_EXPORT > "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_F90_LIB_NAME};${HDF5_F90_C_LIB_NAME}" > ) > add_dependencies(${HDF5_F90_LIB_NAME} > H5GLOBAL H5F H5E H5G H5I H5L H5S H5D H5A H5T H5O > H5P H5R H5Z H5_DBLE_INTERFACE H5LIB ${HDF5_DEPENDS} > ${HDF5_F90_C_LIB_NAME} > ) 151c320 < ADD_SUBDIRECTORY (${HDF5_F90_SOURCE_DIR}/test ${HDF5_F90_BINARY_DIR}/test) --- > ADD_SUBDIRECTORY(${HDF5_F90_SOURCE_DIR}/test ${HDF5_F90_BINARY_DIR}/test) 152a322,335 > > #----------------------------------------------------------------------------- > # Add library to CMake Install : Installs lib and cmake config info > #----------------------------------------------------------------------------- > INSTALL( > TARGETS > ${HDF5_F90_C_LIB_NAME} > ${HDF5_F90_LIB_NAME} > EXPORT > hdf5-targets > LIBRARY DESTINATION lib > ARCHIVE DESTINATION lib > RUNTIME DESTINATION bin > ) diff -r Cmake-1.8.5-contrib/fortran/examples/CMakeLists.txt Cmake-initial-contrib/fortran/examples/CMakeLists.txt 1,6c1 < cmake_minimum_required (VERSION 2.8) < # -------------------------------------------------------------------- < # Notes: When creating examples they should be prefixed < # with "f90_ex_". This allows for easier filtering of the examples. < # -------------------------------------------------------------------- < PROJECT (HDF5_F90_EXAMPLES C CXX Fortran) --- > PROJECT(HDF5_HL_FORTRAN_EXAMPLES C CXX Fortran) 8,16c3 < #----------------------------------------------------------------------------- < # Setup include Directories < #----------------------------------------------------------------------------- < INCLUDE_DIRECTORIES (${CMAKE_Fortran_MODULE_DIRECTORY} ${HDF5_F90_BINARY_DIR} ${HDF5_F90_SOURCE_DIR}/src) < LINK_DIRECTORIES ( < ${CMAKE_Fortran_MODULE_DIRECTORY} < ${HDF5_F90_BINARY_DIR} < ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} < ) --- > # These are examples, currently not compiled 18,35c5,19 < #----------------------------------------------------------------------------- < # Define Sources < #----------------------------------------------------------------------------- < SET (examples < dsetexample < fileexample < rwdsetexample < attrexample < groupexample < grpsexample < grpdsetexample < hyperslab < selectele < grpit < refobjexample < refregexample < mountexample < compound --- > SET(HDF5_HL_FORTRAN_EXAMPLES_SOURCES > ${HDF5_HL_FORTRAN_EXAMPLES_SOURCE_DIR}/dsetexample.f90 > ${HDF5_HL_FORTRAN_EXAMPLES_SOURCE_DIR}/fileexample.f90 > ${HDF5_HL_FORTRAN_EXAMPLES_SOURCE_DIR}/rwdsetexample.f90 > ${HDF5_HL_FORTRAN_EXAMPLES_SOURCE_DIR}/attrexample.f90 > ${HDF5_HL_FORTRAN_EXAMPLES_SOURCE_DIR}/groupexample.f90 > ${HDF5_HL_FORTRAN_EXAMPLES_SOURCE_DIR}/grpsexample.f90 > ${HDF5_HL_FORTRAN_EXAMPLES_SOURCE_DIR}/grpdsetexample.f90 > ${HDF5_HL_FORTRAN_EXAMPLES_SOURCE_DIR}/hyperslab.f90 > ${HDF5_HL_FORTRAN_EXAMPLES_SOURCE_DIR}/selectele.f90 > ${HDF5_HL_FORTRAN_EXAMPLES_SOURCE_DIR}/grpit.f90 > ${HDF5_HL_FORTRAN_EXAMPLES_SOURCE_DIR}/refobjexample.f90 > ${HDF5_HL_FORTRAN_EXAMPLES_SOURCE_DIR}/refregexample.f90 > ${HDF5_HL_FORTRAN_EXAMPLES_SOURCE_DIR}/mountexample.f90 > ${HDF5_HL_FORTRAN_EXAMPLES_SOURCE_DIR}/compound.f90 38,61c22,23 < FOREACH (example ${examples}) < ADD_EXECUTABLE (f90_ex_${example} ${HDF5_F90_EXAMPLES_SOURCE_DIR}/${example}.f90) < H5_NAMING (f90_ex_${example}) < IF (WIN32) < IF (BUILD_SHARED_LIBS) < IF (MSVC) < SET_TARGET_PROPERTIES (f90_ex_${example} < PROPERTIES < COMPILE_FLAGS "/dll" < LINK_FLAGS "/SUBSYSTEM:CONSOLE" < ) < ENDIF (MSVC) < ENDIF (BUILD_SHARED_LIBS) < SET_PROPERTY (TARGET f90_ex_${example} < APPEND PROPERTY COMPILE_DEFINITIONS < HDF5F90_WINDOWS < ) < SET_TARGET_PROPERTIES (f90_ex_${example} PROPERTIES LINKER_LANGUAGE Fortran) < ENDIF (WIN32) < TARGET_LINK_LIBRARIES (f90_ex_${example} < ${HDF5_F90_LIB_TARGET} < ${HDF5_LIB_TARGET} < ) < ENDFOREACH (example ${examples}) --- > SET(HDF5_HL_FORTRAN_TEST_SCRIPT TEST_SCRIPT ${HDF5_HL_FORTRAN_EXAMPLES_SOURCE_DIR}/testh5fc.sh) > Only in Cmake-1.8.5-contrib/fortran/src: CMakeLists.txt diff -r Cmake-1.8.5-contrib/fortran/test/CMakeLists.txt Cmake-initial-contrib/fortran/test/CMakeLists.txt 1,2c1 < cmake_minimum_required (VERSION 2.8) < PROJECT (HDF5_FORTRAN_TESTS C CXX Fortran) --- > PROJECT(HDF5_FORTRAN_TESTS C CXX Fortran) 5c4 < # Setup include Directories --- > # Setup output Directories 7,12c6,16 < INCLUDE_DIRECTORIES (${CMAKE_Fortran_MODULE_DIRECTORY} ${HDF5_F90_BINARY_DIR} ${HDF5_F90_SOURCE_DIR}/src) < LINK_DIRECTORIES ( < ${CMAKE_Fortran_MODULE_DIRECTORY} < ${HDF5_F90_BINARY_DIR} < ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} < ) --- > IF(NOT HDF5_EXTERNALLY_CONFIGURED) > SET (CMAKE_RUNTIME_OUTPUT_DIRECTORY > ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all Executables." > ) > SET (CMAKE_LIBRARY_OUTPUT_DIRECTORY > ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all Libraries" > ) > SET (CMAKE_ARCHIVE_OUTPUT_DIRECTORY > ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all static libraries." > ) > ENDIF(NOT HDF5_EXTERNALLY_CONFIGURED) 17,23c21,22 < ADD_LIBRARY (${HDF5_F90_C_TEST_LIB_TARGET} ${LIB_TYPE} t.c) < # Must explicity add a dependency here to force the generation of headers < # which are created for ${HDF5_F90_C_LIB_TARGET} < #ADD_DEPENDENCIES(${HDF5_F90_C_TEST_LIB_TARGET} ${HDF5_F90_LIB_TARGET} ) < TARGET_LINK_LIBRARIES (${HDF5_F90_C_TEST_LIB_TARGET} < ${HDF5_F90_C_LIB_TARGET} < ${HDF5_TEST_LIB_TARGET} --- > ADD_LIBRARY(hdf5_f90Ctest > t.c 25c24 < H5_SET_LIB_OPTIONS (${HDF5_F90_C_TEST_LIB_TARGET} ${HDF5_F90_C_TEST_LIB_NAME} ${LIB_TYPE}) --- > TARGET_LINK_LIBRARIES(hdf5_f90Ctest ${HDF5_F90_C_LIB_NAME} ${HDF5_TEST_LIB_NAME} ) 27,31c26,27 < ADD_LIBRARY (${HDF5_F90_TEST_LIB_TARGET} ${LIB_TYPE} tf.f90) < # Must explicity add a dependency here to force the generation of headers < # which are created for ${HDF5_F90_C_LIB_TARGET} < ADD_DEPENDENCIES(${HDF5_F90_TEST_LIB_TARGET} < ${HDF5_F90_C_TEST_LIB_TARGET} --- > ADD_LIBRARY(h5test_fortran STATIC > tf.f90 33,54c29,30 < IF (WIN32) < IF (BUILD_SHARED_LIBS) < SET_PROPERTY (TARGET ${HDF5_F90_TEST_LIB_TARGET} < APPEND PROPERTY COMPILE_DEFINITIONS < BUILD_HDF5_DLL < ) < IF (MSVC) < SET_TARGET_PROPERTIES (${HDF5_F90_TEST_LIB_TARGET} < PROPERTIES < COMPILE_FLAGS "/dll" < LINK_FLAGS "/SUBSYSTEM:CONSOLE /DLL" < ) < ENDIF (MSVC) < ENDIF (BUILD_SHARED_LIBS) < SET_PROPERTY (TARGET ${HDF5_F90_TEST_LIB_TARGET} < APPEND PROPERTY COMPILE_DEFINITIONS < HDF5F90_WINDOWS < ) < ENDIF (WIN32) < SET_TARGET_PROPERTIES (${HDF5_F90_TEST_LIB_TARGET} PROPERTIES LINKER_LANGUAGE Fortran) < TARGET_LINK_LIBRARIES (${HDF5_F90_TEST_LIB_TARGET} ${HDF5_F90_C_TEST_LIB_TARGET}) < H5_SET_LIB_OPTIONS (${HDF5_F90_TEST_LIB_TARGET} ${HDF5_F90_TEST_LIB_NAME} ${LIB_TYPE}) --- > TARGET_LINK_LIBRARIES(h5test_fortran hdf5_f90Ctest ) > add_dependencies(h5test_fortran ${HDF5_F90_LIB_NAME}) 58a35,36 > INCLUDE_DIRECTORIES(${HDF5_SRC_DIR} ${HDF5_FORTRAN_SOURCE_DIR}) > LINK_DIRECTORIES(${HDF5_SRC_DIR} ${HDF5_FORTRAN_SOURCE_DIR} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}) 60,105c38,68 < #-- Adding test for testhdf5_fortran < ADD_EXECUTABLE (testhdf5_fortran < fortranlib_test.f90 < tH5A.f90 < tH5D.f90 < tH5E.f90 < tH5F.f90 < tH5G.f90 < tH5I.f90 < tH5P.f90 < tH5R.f90 < tH5S.f90 < tH5Sselect.f90 < tH5T.f90 < tH5VL.f90 < tH5Z.f90 < ) < H5_NAMING (testhdf5_fortran) < TARGET_LINK_LIBRARIES (testhdf5_fortran < ${HDF5_F90_TEST_LIB_TARGET} < ${HDF5_F90_LIB_TARGET} < ${HDF5_LIB_TARGET} < ) < IF (WIN32) < IF (MSVC) < TARGET_LINK_LIBRARIES (testhdf5_fortran "ws2_32.lib") < IF (BUILD_SHARED_LIBS) < SET_TARGET_PROPERTIES (testhdf5_fortran < PROPERTIES < COMPILE_FLAGS "/dll" < LINK_FLAGS "/SUBSYSTEM:CONSOLE" < ) < ENDIF (BUILD_SHARED_LIBS) < ENDIF (MSVC) < ENDIF (WIN32) < SET_TARGET_PROPERTIES (testhdf5_fortran PROPERTIES LINKER_LANGUAGE Fortran) < < ADD_TEST (NAME testhdf5_fortran COMMAND $) < < #-- Adding test for testhdf5_fortran_1_8 < ADD_EXECUTABLE (testhdf5_fortran_1_8 < fortranlib_test_1_8.f90 < tH5F.f90 < tH5O.f90 < tH5A_1_8.f90 < tH5G_1_8.f90 --- > SET (TEST_MODULE_LIST > ${HDF5_F90_LIB_NAME} H5GLOBAL H5F H5E H5G H5I H5L H5S H5D H5A H5T H5O > H5P H5R H5Z H5_DBLE_INTERFACE H5LIB > ) > > #-- Adding test for fortranlib_test > ADD_EXECUTABLE(fortranlib_test fortranlib_test.f90 > tH5A.f90 > tH5D.f90 > tH5E.f90 > tH5F.f90 > tH5G.f90 > tH5I.f90 > tH5P.f90 > tH5R.f90 > tH5S.f90 > tH5Sselect.f90 > tH5T.f90 > tH5VL.f90 > tH5Z.f90 > ) > TARGET_LINK_LIBRARIES(fortranlib_test h5test_fortran ${TEST_MODULE_LIST} ) > ADD_TEST(fortranlib_test ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/fortranlib_test) > > #-- Adding test for fortranlib_test_1_8 > ADD_EXECUTABLE(fortranlib_test_1_8 > fortranlib_test_1_8.f90 > tH5F.f90 > tH5O.f90 > tH5A_1_8.f90 > tH5G_1_8.f90 107,127c70,71 < H5_NAMING (testhdf5_fortran_1_8) < TARGET_LINK_LIBRARIES (testhdf5_fortran_1_8 < ${HDF5_F90_TEST_LIB_TARGET} < ${HDF5_F90_LIB_TARGET} < ${HDF5_LIB_TARGET} < ) < IF (WIN32) < IF (MSVC) < TARGET_LINK_LIBRARIES (testhdf5_fortran_1_8 "ws2_32.lib") < IF (BUILD_SHARED_LIBS) < SET_TARGET_PROPERTIES (testhdf5_fortran_1_8 < PROPERTIES < COMPILE_FLAGS "/dll" < LINK_FLAGS "/SUBSYSTEM:CONSOLE" < ) < ENDIF (BUILD_SHARED_LIBS) < ENDIF (MSVC) < ENDIF (WIN32) < SET_TARGET_PROPERTIES (testhdf5_fortran_1_8 PROPERTIES LINKER_LANGUAGE Fortran) < < ADD_TEST (NAME testhdf5_fortran_1_8 COMMAND $) --- > TARGET_LINK_LIBRARIES(fortranlib_test_1_8 h5test_fortran ${TEST_MODULE_LIST} ) > ADD_TEST(fortranlib_test_1_8 ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/fortranlib_test_1_8) 130,151c74,76 < ADD_EXECUTABLE (fflush1 fflush1.f90) < H5_NAMING (fflush1) < TARGET_LINK_LIBRARIES (fflush1 < ${HDF5_F90_LIB_TARGET} < ${HDF5_F90_TEST_LIB_TARGET} < ${HDF5_LIB_TARGET} < ) < IF (WIN32) < IF (MSVC) < TARGET_LINK_LIBRARIES (fflush1 "ws2_32.lib") < IF (BUILD_SHARED_LIBS) < SET_TARGET_PROPERTIES (fflush1 < PROPERTIES < COMPILE_FLAGS "/dll" < LINK_FLAGS "/SUBSYSTEM:CONSOLE" < ) < ENDIF (BUILD_SHARED_LIBS) < ENDIF (MSVC) < ENDIF (WIN32) < SET_TARGET_PROPERTIES (fflush1 PROPERTIES LINKER_LANGUAGE Fortran) < < ADD_TEST (NAME fflush1 COMMAND $) --- > ADD_EXECUTABLE(fflush1 fflush1.f90) > TARGET_LINK_LIBRARIES(fflush1 h5test_fortran ${TEST_MODULE_LIST} ) > ADD_TEST(fflush1 ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/fflush1) 154,173c79,83 < ADD_EXECUTABLE (fflush2 fflush2.f90) < H5_NAMING (fflush2) < TARGET_LINK_LIBRARIES (fflush2 < ${HDF5_F90_TEST_LIB_TARGET} < ${HDF5_F90_LIB_TARGET} < ${HDF5_LIB_TARGET} < ) < IF (WIN32) < IF (MSVC) < TARGET_LINK_LIBRARIES (fflush2 "ws2_32.lib") < IF (BUILD_SHARED_LIBS) < SET_TARGET_PROPERTIES (fflush2 < PROPERTIES < COMPILE_FLAGS "/dll" < LINK_FLAGS "/SUBSYSTEM:CONSOLE" < ) < ENDIF (BUILD_SHARED_LIBS) < ENDIF (MSVC) < ENDIF (WIN32) < SET_TARGET_PROPERTIES (fflush2 PROPERTIES LINKER_LANGUAGE Fortran) --- > ADD_EXECUTABLE(fflush2 fflush2.f90) > TARGET_LINK_LIBRARIES(fflush2 h5test_fortran ${TEST_MODULE_LIST} ) > ADD_TEST(fflush2 ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/fflush2) > > 175d84 < ADD_TEST (NAME fflush2 COMMAND $) diff -r Cmake-1.8.5-contrib/hl/c++/CMakeLists.txt Cmake-initial-contrib/hl/c++/CMakeLists.txt 1,2c1,3 < cmake_minimum_required (VERSION 2.8) < PROJECT (HDF5_HL_CPP) --- > # SET project's name > PROJECT( HDF5_HL_CPP ) > cmake_minimum_required(VERSION 2.6) 5c6 < # Main HL lib is in /src --- > # Setup output Directories 7c8,31 < ADD_SUBDIRECTORY (${HDF5_HL_CPP_SOURCE_DIR}/src ${HDF5_HL_CPP_BINARY_DIR}/src) --- > IF(NOT HDF5_EXTERNALLY_CONFIGURED) > SET (CMAKE_RUNTIME_OUTPUT_DIRECTORY > ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all Executables." > ) > SET (CMAKE_LIBRARY_OUTPUT_DIRECTORY > ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all Libraries" > ) > SET (CMAKE_ARCHIVE_OUTPUT_DIRECTORY > ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all static libraries." > ) > ENDIF(NOT HDF5_EXTERNALLY_CONFIGURED) > > SET (HDF5_HL_CPP_SRCS ${HDF5_HL_CPP_SOURCE_DIR}/src/H5PacketTable.cpp) > SET (HDF5_HL_CPP_HDRS ${HDF5_HL_CPP_SOURCE_DIR}/src/H5PacketTable.h) > INCLUDE_DIRECTORIES(${HDF5_HL_SOURCE_DIR}/src) > INCLUDE_DIRECTORIES(${HDF5_HL_CPP_SOURCE_DIR}/src) > > add_library( ${HDF5_HL_CPP_LIB_NAME} ${HDF5_HL_CPP_SRCS} ) > SET_GLOBAL_VARIABLE(HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_HL_CPP_LIB_NAME}") > TARGET_LINK_LIBRARIES(${HDF5_HL_CPP_LIB_NAME} > ${HDF5_HL_LIB_NAME} > ${HDF5_CPP_LIB_NAME} > ${HDF5_LIB_NAME} ) > H5_SET_LIB_OPTIONS(${HDF5_HL_CPP_LIB_NAME} ${HDF5_HL_CPP_LIB_NAME} ${LIB_TYPE}) 12,14c36,50 < IF (HDF5_BUILD_EXAMPLES) < ADD_SUBDIRECTORY (${HDF5_HL_CPP_SOURCE_DIR}/examples ${HDF5_HL_CPP_BINARY_DIR}/examples) < ENDIF (HDF5_BUILD_EXAMPLES) --- > IF (HDF5_BUILD_HL_EXAMPLES) > ADD_EXECUTABLE(ptExampleFL ${HDF5_HL_CPP_SOURCE_DIR}/examples/ptExampleFL.cpp) > TARGET_LINK_LIBRARIES(ptExampleFL > ${HDF5_HL_CPP_LIB_NAME} > ${HDF5_HL_LIB_NAME} > ${HDF5_CPP_LIB_NAME} > ${HDF5_LIB_NAME} ) > > ADD_EXECUTABLE(ptExampleVL ${HDF5_HL_CPP_SOURCE_DIR}/examples/ptExampleVL.cpp) > TARGET_LINK_LIBRARIES(ptExampleVL > ${HDF5_HL_CPP_LIB_NAME} > ${HDF5_HL_LIB_NAME} > ${HDF5_CPP_LIB_NAME} > ${HDF5_LIB_NAME} ) > ENDIF() 21,22c57,91 < ADD_SUBDIRECTORY (${HDF5_HL_CPP_SOURCE_DIR}/test ${HDF5_HL_CPP_BINARY_DIR}/test) < ENDIF (BUILD_TESTING) --- > INCLUDE_DIRECTORIES(${HDF5_TEST_SOURCE_DIR} ) > INCLUDE_DIRECTORIES(${HDF5_HL_SOURCE_DIR}/test) > INCLUDE_DIRECTORIES(${HDF5_CPP_SOURCE_DIR}/src) > > ADD_EXECUTABLE(hl_ptableTest ${HDF5_HL_CPP_SOURCE_DIR}/test/ptableTest.cpp) > TARGET_LINK_LIBRARIES(hl_ptableTest > ${HDF5_HL_CPP_LIB_NAME} > ${HDF5_HL_LIB_NAME} > ${HDF5_CPP_LIB_NAME} > ${HDF5_LIB_NAME} ) > ADD_TEST(hl_ptableTest ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/hl_ptableTest) > ENDIF() > > #----------------------------------------------------------------------------- > # Rules for Installation of headers/etc using make Install target > #----------------------------------------------------------------------------- > INSTALL( > FILES > ${HDF5_HL_CPP_HDRS} > DESTINATION > include/hl/cpp > ) > > #----------------------------------------------------------------------------- > # Add library to a (global) CMake 'Install target' for external use > #----------------------------------------------------------------------------- > INSTALL( > TARGETS > ${HDF5_HL_CPP_LIB_NAME} > EXPORT > ${HDF5_EXPORTED_TARGETS} > LIBRARY DESTINATION lib > ARCHIVE DESTINATION lib > RUNTIME DESTINATION bin > ) Only in Cmake-1.8.5-contrib/hl/c++/examples: CMakeLists.txt Only in Cmake-1.8.5-contrib/hl/c++/src: CMakeLists.txt Only in Cmake-1.8.5-contrib/hl/c++/test: CMakeLists.txt diff -r Cmake-1.8.5-contrib/hl/CMakeLists.txt Cmake-initial-contrib/hl/CMakeLists.txt 1,2c1,16 < cmake_minimum_required (VERSION 2.8) < PROJECT (HDF5_HL) --- > PROJECT(HDF5_HL) > > #----------------------------------------------------------------------------- > # Setup output Directories > #----------------------------------------------------------------------------- > IF(NOT HDF5_EXTERNALLY_CONFIGURED) > SET (CMAKE_RUNTIME_OUTPUT_DIRECTORY > ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all Executables." > ) > SET (CMAKE_LIBRARY_OUTPUT_DIRECTORY > ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all Libraries" > ) > SET (CMAKE_ARCHIVE_OUTPUT_DIRECTORY > ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all static libraries." > ) > ENDIF(NOT HDF5_EXTERNALLY_CONFIGURED) 8c22 < SET (HL_BUILT_AS_DYNAMIC_LIB 1) --- > SET (HL_BUILT_AS_DYNAMIC_LIB 1) 10c24 < --- > 14c28 < INCLUDE_DIRECTORIES (${HDF5_HL_SOURCE_DIR}/src ) --- > INCLUDE_DIRECTORIES( ${HDF5_HL_SOURCE_DIR}/src ) 16c30,53 < ADD_SUBDIRECTORY (${HDF5_HL_SOURCE_DIR}/src ${HDF5_HL_BINARY_DIR}/src) --- > SET (HL_SRCS > ${HDF5_HL_SOURCE_DIR}/src/H5DS.c > ${HDF5_HL_SOURCE_DIR}/src/H5IM.c > ${HDF5_HL_SOURCE_DIR}/src/H5LT.c > ${HDF5_HL_SOURCE_DIR}/src/H5LTanalyze.c > ${HDF5_HL_SOURCE_DIR}/src/H5LTparse.c > ${HDF5_HL_SOURCE_DIR}/src/H5PT.c > ${HDF5_HL_SOURCE_DIR}/src/H5TB.c > ) > > SET (HL_HEADERS > ${HDF5_HL_SOURCE_DIR}/src/H5DSpublic.h > ${HDF5_HL_SOURCE_DIR}/src/H5IMpublic.h > ${HDF5_HL_SOURCE_DIR}/src/H5LTparse.h > ${HDF5_HL_SOURCE_DIR}/src/H5LTpublic.h > ${HDF5_HL_SOURCE_DIR}/src/H5PTpublic.h > ${HDF5_HL_SOURCE_DIR}/src/H5TBpublic.h > ${HDF5_HL_SOURCE_DIR}/src/hdf5_hl.h > ) > > ADD_LIBRARY(${HDF5_HL_LIB_NAME} ${LIB_TYPE} ${HL_SRCS} ${HL_HEADERS} ) > SET_GLOBAL_VARIABLE(HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_HL_LIB_NAME}") > TARGET_LINK_LIBRARIES(${HDF5_HL_LIB_NAME} ${HDF5_LIB_NAME} ) > H5_SET_LIB_OPTIONS(${HDF5_HL_LIB_NAME} ${HDF5_HL_LIB_NAME} ${LIB_TYPE}) 19,21c56,60 < IF (HDF5_BUILD_TOOLS) < ADD_SUBDIRECTORY (${HDF5_HL_SOURCE_DIR}/tools ${HDF5_HL_BINARY_DIR}/tools) < ENDIF (HDF5_BUILD_TOOLS) --- > OPTION(HDF5_BUILD_HL_TOOLS "Build the High Level Tools" OFF) > IF (HDF5_BUILD_HL_TOOLS) > add_subdirectory( ${HDF5_HL_SOURCE_DIR}/tools ${HDF5_HL_BINARY_DIR}/tools) > ENDIF() > 24,26c63,66 < IF (HDF5_BUILD_EXAMPLES) < ADD_SUBDIRECTORY (${HDF5_HL_SOURCE_DIR}/examples ${HDF5_HL_BINARY_DIR}/examples) < ENDIF (HDF5_BUILD_EXAMPLES) --- > OPTION(HDF5_BUILD_HL_EXAMPLES "Build the High Level Examples" OFF) > IF(HDF5_BUILD_HL_EXAMPLES) > add_subdirectory( ${HDF5_HL_SOURCE_DIR}/examples ${HDF5_HL_BINARY_DIR}/examples) > ENDIF() 29,33c69,73 < IF (NOT HDF5_EXTERNALLY_CONFIGURED) < IF (BUILD_TESTING) < ADD_SUBDIRECTORY (${HDF5_HL_SOURCE_DIR}/test ${HDF5_HL_BINARY_DIR}/test) < ENDIF (BUILD_TESTING) < ENDIF (NOT HDF5_EXTERNALLY_CONFIGURED) --- > IF(NOT HDF5_EXTERNALLY_CONFIGURED) > if (BUILD_TESTING) > add_subdirectory( ${HDF5_HL_SOURCE_DIR}/test ${HDF5_HL_BINARY_DIR}/test) > endif() > ENDIF(NOT HDF5_EXTERNALLY_CONFIGURED) 36,42c76,105 < IF (HDF5_BUILD_FORTRAN) < ADD_SUBDIRECTORY (fortran) < ENDIF (HDF5_BUILD_FORTRAN) < < IF (HDF5_BUILD_CPP_LIB) < ADD_SUBDIRECTORY (${HDF5_HL_SOURCE_DIR}/c++ ${HDF5_HL_BINARY_DIR}/c++) < ENDIF (HDF5_BUILD_CPP_LIB) --- > if(HDF5_BUILD_FORTRAN) > add_subdirectory(fortran) > endif() > > if(HDF5_BUILD_CPP_LIB) > add_subdirectory(${HDF5_HL_SOURCE_DIR}/c++ ${HDF5_HL_BINARY_DIR}/c++) > endif() > > #----------------------------------------------------------------------------- > # Rules for Installation of headers/etc using make Install target > #----------------------------------------------------------------------------- > INSTALL ( > FILES > ${HL_HEADERS} > DESTINATION > include > ) > > #----------------------------------------------------------------------------- > # Add library to CMake Install : Installs lib and cmake config info > #----------------------------------------------------------------------------- > INSTALL( > TARGETS > ${HDF5_HL_LIB_NAME} > EXPORT > ${HDF5_EXPORTED_TARGETS} > LIBRARY DESTINATION lib > ARCHIVE DESTINATION lib > RUNTIME DESTINATION bin > ) diff -r Cmake-1.8.5-contrib/hl/examples/CMakeLists.txt Cmake-initial-contrib/hl/examples/CMakeLists.txt 1,2c1,3 < cmake_minimum_required (VERSION 2.8) < PROJECT (HDF5_HL_EXAMPLES ) --- > # set project's name > PROJECT( HDF5_HL_EXAMPLES ) > cmake_minimum_required(VERSION 2.6) 5c6 < # Define Sources --- > # Setup output Directories 7,34c8,18 < SET (examples < ex_lite1 < ex_lite2 < ex_lite3 < ptExampleFL < ptExampleVL < ex_image1 < ex_image2 < ex_table_01 < ex_table_02 < ex_table_03 < ex_table_04 < ex_table_05 < ex_table_06 < ex_table_07 < ex_table_08 < ex_table_09 < ex_table_10 < ex_table_11 < ex_table_12 < ex_ds1 < ) < < FOREACH (example ${examples}) < ADD_EXECUTABLE (hl_ex_${example} ${HDF5_HL_EXAMPLES_SOURCE_DIR}/${example}.c) < H5_NAMING (hl_ex_${example}) < TARGET_LINK_LIBRARIES (hl_ex_${example} ${HDF5_HL_LIB_TARGET} ${HDF5_LIB_TARGET}) < ENDFOREACH (example ${examples}) --- > IF(NOT HDF5_EXTERNALLY_CONFIGURED) > SET (CMAKE_RUNTIME_OUTPUT_DIRECTORY > ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all Executables." > ) > SET (CMAKE_LIBRARY_OUTPUT_DIRECTORY > ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all Libraries" > ) > SET (CMAKE_ARCHIVE_OUTPUT_DIRECTORY > ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all static libraries." > ) > ENDIF(NOT HDF5_EXTERNALLY_CONFIGURED) 36a21,88 > #-- Adding Example program ex_image1 > ADD_EXECUTABLE(ex_image1 ${HDF5_HL_EXAMPLES_SOURCE_DIR}/ex_image1.c) > TARGET_LINK_LIBRARIES(ex_image1 ${HDF5_HL_LIB_NAME} ${HDF5_LIB_NAME} ) > > #-- Adding Example program ex_image2 > ADD_EXECUTABLE(ex_image2 ${HDF5_HL_EXAMPLES_SOURCE_DIR}/ex_image2.c) > TARGET_LINK_LIBRARIES(ex_image2 ${HDF5_HL_LIB_NAME} ${HDF5_LIB_NAME} ) > > #-- Adding Example program ex_lite1 > ADD_EXECUTABLE(ex_lite1 ${HDF5_HL_EXAMPLES_SOURCE_DIR}/ex_lite1.c) > TARGET_LINK_LIBRARIES(ex_lite1 ${HDF5_HL_LIB_NAME} ${HDF5_LIB_NAME} ) > > #-- Adding Example program ex_lite2 > ADD_EXECUTABLE(ex_lite2 ${HDF5_HL_EXAMPLES_SOURCE_DIR}/ex_lite2.c) > TARGET_LINK_LIBRARIES(ex_lite2 ${HDF5_HL_LIB_NAME} ${HDF5_LIB_NAME} ) > > #-- Adding Example program ex_lite3 > ADD_EXECUTABLE(ex_lite3 ${HDF5_HL_EXAMPLES_SOURCE_DIR}/ex_lite3.c) > TARGET_LINK_LIBRARIES(ex_lite3 ${HDF5_HL_LIB_NAME} ${HDF5_LIB_NAME} ) > > #-- Adding Example program ex_table_01 > ADD_EXECUTABLE(ex_table_01 ${HDF5_HL_EXAMPLES_SOURCE_DIR}/ex_table_01.c) > TARGET_LINK_LIBRARIES(ex_table_01 ${HDF5_HL_LIB_NAME} ${HDF5_LIB_NAME} ) > > #-- Adding Example program ex_table_02 > ADD_EXECUTABLE(ex_table_02 ${HDF5_HL_EXAMPLES_SOURCE_DIR}/ex_table_02.c) > TARGET_LINK_LIBRARIES(ex_table_02 ${HDF5_HL_LIB_NAME} ${HDF5_LIB_NAME} ) > > #-- Adding Example program ex_table_03 > ADD_EXECUTABLE(ex_table_03 ${HDF5_HL_EXAMPLES_SOURCE_DIR}/ex_table_03.c) > TARGET_LINK_LIBRARIES(ex_table_03 ${HDF5_HL_LIB_NAME} ${HDF5_LIB_NAME} ) > > #-- Adding Example program ex_table_04 > ADD_EXECUTABLE(ex_table_04 ${HDF5_HL_EXAMPLES_SOURCE_DIR}/ex_table_04.c) > TARGET_LINK_LIBRARIES(ex_table_04 ${HDF5_HL_LIB_NAME} ${HDF5_LIB_NAME} ) > > #-- Adding Example program ex_table_05 > ADD_EXECUTABLE(ex_table_05 ${HDF5_HL_EXAMPLES_SOURCE_DIR}/ex_table_05.c) > TARGET_LINK_LIBRARIES(ex_table_05 ${HDF5_HL_LIB_NAME} ${HDF5_LIB_NAME} ) > > #-- Adding Example program ex_table_06 > ADD_EXECUTABLE(ex_table_06 ${HDF5_HL_EXAMPLES_SOURCE_DIR}/ex_table_06.c) > TARGET_LINK_LIBRARIES(ex_table_06 ${HDF5_HL_LIB_NAME} ${HDF5_LIB_NAME} ) > > #-- Adding Example program ex_table_07 > ADD_EXECUTABLE(ex_table_07 ${HDF5_HL_EXAMPLES_SOURCE_DIR}/ex_table_07.c) > TARGET_LINK_LIBRARIES(ex_table_07 ${HDF5_HL_LIB_NAME} ${HDF5_LIB_NAME} ) > > #-- Adding Example program ex_table_08 > ADD_EXECUTABLE(ex_table_08 ${HDF5_HL_EXAMPLES_SOURCE_DIR}/ex_table_08.c) > TARGET_LINK_LIBRARIES(ex_table_08 ${HDF5_HL_LIB_NAME} ${HDF5_LIB_NAME} ) > > #-- Adding Example program ex_table_09 > ADD_EXECUTABLE(ex_table_09 ${HDF5_HL_EXAMPLES_SOURCE_DIR}/ex_table_09.c) > TARGET_LINK_LIBRARIES(ex_table_09 ${HDF5_HL_LIB_NAME} ${HDF5_LIB_NAME} ) > > #-- Adding Example program ex_table_10 > ADD_EXECUTABLE(ex_table_10 ${HDF5_HL_EXAMPLES_SOURCE_DIR}/ex_table_10.c) > TARGET_LINK_LIBRARIES(ex_table_10 ${HDF5_HL_LIB_NAME} ${HDF5_LIB_NAME} ) > > #-- Adding Example program ex_table_11 > ADD_EXECUTABLE(ex_table_11 ${HDF5_HL_EXAMPLES_SOURCE_DIR}/ex_table_11.c) > TARGET_LINK_LIBRARIES(ex_table_11 ${HDF5_HL_LIB_NAME} ${HDF5_LIB_NAME} ) > > #-- Adding Example program ex_table_12 > ADD_EXECUTABLE(ex_table_12 ${HDF5_HL_EXAMPLES_SOURCE_DIR}/ex_table_12.c) > TARGET_LINK_LIBRARIES(ex_table_12 ${HDF5_HL_LIB_NAME} ${HDF5_LIB_NAME} ) > diff -r Cmake-1.8.5-contrib/hl/fortran/CMakeLists.txt Cmake-initial-contrib/hl/fortran/CMakeLists.txt 1d0 < cmake_minimum_required (VERSION 2.8) 5,24d3 < # Setup include Directories < #----------------------------------------------------------------------------- < INCLUDE_DIRECTORIES (${HDF5_F90_SOURCE_DIR}/src) < INCLUDE_DIRECTORIES (${HDF5_F90_BINARY_DIR}) < INCLUDE_DIRECTORIES (${HDF5_F90_SRC_BINARY_DIR}) < INCLUDE_DIRECTORIES (${CMAKE_Fortran_MODULE_DIRECTORY}) < < LINK_DIRECTORIES (${HDF5_SRC_DIR} ${HDF5_FORTRAN_SOURCE_DIR} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}) < < #----------------------------------------------------------------------------- < # Add debug information (intel Fortran : JB) < #----------------------------------------------------------------------------- < IF (CMAKE_Fortran_COMPILER MATCHES ifort) < IF (WIN32) < SET (CMAKE_Fortran_FLAGS_DEBUG "/debug:full /dbglibs " CACHE "flags" STRING FORCE) < SET (CMAKE_EXE_LINKER_FLAGS_DEBUG "/DEBUG" CACHE "flags" STRING FORCE) < ENDIF (WIN32) < ENDIF (CMAKE_Fortran_COMPILER MATCHES ifort) < < #----------------------------------------------------------------------------- 27,34c6,44 < ADD_SUBDIRECTORY (${HDF5_HL_F90_SOURCE_DIR}/src ${HDF5_HL_F90_BINARY_DIR}/src) < < #----------------------------------------------------------------------------- < # Build the HL Fortran Examples < #----------------------------------------------------------------------------- < IF (HDF5_BUILD_FORTRAN_EXAMPLES) < ADD_SUBDIRECTORY (${HDF5_HL_F90_SOURCE_DIR}/examples ${HDF5_HL_F90_BINARY_DIR}/examples) < ENDIF (HDF5_BUILD_FORTRAN_EXAMPLES) --- > MESSAGE( "Fortran source is in ${HDF5_F90_SOURCE_DIR}/src ") > INCLUDE_DIRECTORIES( ${HDF5_F90_SOURCE_DIR}/src ) > INCLUDE_DIRECTORIES( ${HDF5_HL_F90_SOURCE_DIR} ) > INCLUDE_DIRECTORIES( ${HDF5_F90_BINARY_DIR} ) > INCLUDE_DIRECTORIES( ${HDF5_HL_F90_SOURCE_DIR}/src ) > > ADD_LIBRARY(H5TB STATIC ${HDF5_HL_F90_SOURCE_DIR}/src/H5TBff.f90 ) > ADD_LIBRARY(H5LT STATIC ${HDF5_HL_F90_SOURCE_DIR}/src/H5LTff.f90 ) > ADD_LIBRARY(H5IM STATIC ${HDF5_HL_F90_SOURCE_DIR}/src/H5IMff.f90 ) > > SET (HDF5_HL_F90_C_SRCS > ${HDF5_HL_F90_SOURCE_DIR}/src/H5LTfc.c > ${HDF5_HL_F90_SOURCE_DIR}/src/H5IMfc.c > ${HDF5_HL_F90_SOURCE_DIR}/src/H5IMcc.c > ${HDF5_HL_F90_SOURCE_DIR}/src/H5TBfc.c > ) > > add_dependencies(H5TB H5GLOBAL HDF5) > add_dependencies(H5LT H5GLOBAL HDF5) > add_dependencies(H5IM H5GLOBAL HDF5) > > SET (HDF5_HL_F90_HEADERS > ${HDF5_HL_F90_SOURCE_DIR}/src/H5LTf90proto.h > ) > > ADD_LIBRARY(${HDF5_HL_F90_C_LIB_NAME} > ${LIB_TYPE} > ${HDF5_HL_F90_C_SRCS} ${HDF5_HL_F90_HEADERS} > ) > SET_GLOBAL_VARIABLE(HDF5_LIBRARIES_TO_EXPORT > "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_HL_F90_C_LIB_NAME}" > ) > TARGET_LINK_LIBRARIES(${HDF5_HL_F90_C_LIB_NAME} > ${HDF5_HL_LIB_NAME} > ${HDF5_F90_C_LIB_NAME} > ) > H5_SET_LIB_OPTIONS(${HDF5_HL_F90_C_LIB_NAME} > ${HDF5_HL_F90_C_LIB_NAME} ${LIB_TYPE} > ) 38a49 > 40c51 < ADD_SUBDIRECTORY (${HDF5_HL_F90_SOURCE_DIR}/test ${HDF5_HL_F90_BINARY_DIR}/test) --- > ADD_SUBDIRECTORY(${HDF5_HL_F90_SOURCE_DIR}/test ${HDF5_HL_F90_BINARY_DIR}/test) Only in Cmake-1.8.5-contrib/hl/fortran/examples: CMakeLists.txt Only in Cmake-1.8.5-contrib/hl/fortran/src: CMakeLists.txt diff -r Cmake-1.8.5-contrib/hl/fortran/test/CMakeLists.txt Cmake-initial-contrib/hl/fortran/test/CMakeLists.txt 1,2c1,5 < cmake_minimum_required (VERSION 2.8) < PROJECT (HDF5_HL_FORTRAN_TESTS C CXX Fortran) --- > PROJECT(HDF5_HL_F90_TESTS C CXX Fortran) > > INCLUDE_DIRECTORIES(${HDF5_HL_F90_TESTS_SOURCE_DIR}) > INCLUDE_DIRECTORIES(${HDF5_HL_F90_SOURCE_DIR}/src) > INCLUDE_DIRECTORIES(${HDF5_HL_F90_BINARY_DIR}) 5c8 < # Add Tests --- > # Add Test Executables 7,12c10,13 < INCLUDE_DIRECTORIES (${CMAKE_Fortran_MODULE_DIRECTORY} ${HDF5_F90_BINARY_DIR} ${HDF5_F90_SOURCE_DIR}/src) < LINK_DIRECTORIES ( < ${CMAKE_Fortran_MODULE_DIRECTORY} < ${HDF5_HL_F90_BINARY_DIR} < ${HDF5_F90_BINARY_DIR} < ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} --- > > ADD_EXECUTABLE( > tstimage > ${HDF5_HL_F90_TESTS_SOURCE_DIR}/tstimage.f90 13a15 > TARGET_LINK_LIBRARIES(tstimage ${HDF5_HL_F90_C_LIB_NAME} H5IM H5GLOBAL H5LIB H5F) 15,68c17,21 < #-- Adding test for hl_f90_tstlite < ADD_EXECUTABLE (hl_f90_tstlite tstlite.f90) < H5_NAMING (hl_f90_tstlite) < IF (BUILD_SHARED_LIBS) < IF (WIN32) < IF (MSVC) < SET_TARGET_PROPERTIES (hl_f90_tstlite < PROPERTIES < COMPILE_FLAGS "/dll" < LINK_FLAGS "/SUBSYSTEM:CONSOLE" < ) < ENDIF (MSVC) < ENDIF (WIN32) < ENDIF (BUILD_SHARED_LIBS) < TARGET_LINK_LIBRARIES (hl_f90_tstlite ${HDF5_HL_F90_LIB_TARGET} ${HDF5_F90_LIB_TARGET}) < SET_TARGET_PROPERTIES (hl_f90_tstlite PROPERTIES LINKER_LANGUAGE Fortran) < < ADD_TEST (NAME hl_f90_tstlite COMMAND $) < < #-- Adding test for hl_f90_tstimage < ADD_EXECUTABLE (hl_f90_tstimage tstimage.f90) < H5_NAMING (hl_f90_tstimage) < IF (BUILD_SHARED_LIBS) < IF (WIN32) < IF (MSVC) < SET_TARGET_PROPERTIES (hl_f90_tstimage < PROPERTIES < COMPILE_FLAGS "/dll" < LINK_FLAGS "/SUBSYSTEM:CONSOLE" < ) < ENDIF (MSVC) < ENDIF (WIN32) < ENDIF (BUILD_SHARED_LIBS) < TARGET_LINK_LIBRARIES (hl_f90_tstimage ${HDF5_HL_F90_LIB_TARGET} ${HDF5_F90_LIB_TARGET}) < SET_TARGET_PROPERTIES (hl_f90_tstimage PROPERTIES LINKER_LANGUAGE Fortran) < < ADD_TEST (NAME hl_f90_tstimage COMMAND $) < < #-- Adding test for hl_f90_tsttable < ADD_EXECUTABLE (hl_f90_tsttable tsttable.f90) < H5_NAMING (hl_f90_tsttable) < IF (BUILD_SHARED_LIBS) < IF (WIN32) < IF (MSVC) < SET_TARGET_PROPERTIES (hl_f90_tsttable < PROPERTIES < COMPILE_FLAGS "/dll" < LINK_FLAGS "/SUBSYSTEM:CONSOLE" < ) < ENDIF (MSVC) < ENDIF (WIN32) < ENDIF (BUILD_SHARED_LIBS) < TARGET_LINK_LIBRARIES (hl_f90_tsttable ${HDF5_HL_F90_LIB_TARGET} ${HDF5_F90_LIB_TARGET}) < SET_TARGET_PROPERTIES (hl_f90_tsttable PROPERTIES LINKER_LANGUAGE Fortran) --- > ADD_EXECUTABLE( > tstlite > ${HDF5_HL_F90_TESTS_SOURCE_DIR}/tstlite.f90 > ) > TARGET_LINK_LIBRARIES(tstlite ${HDF5_HL_F90_C_LIB_NAME} H5LT H5GLOBAL H5LIB H5F) 70c23,34 < ADD_TEST (NAME hl_f90_tsttable COMMAND $) --- > ADD_EXECUTABLE( > tsttable > ${HDF5_HL_F90_TESTS_SOURCE_DIR}/tsttable.f90 > ) > TARGET_LINK_LIBRARIES(tsttable ${HDF5_HL_F90_C_LIB_NAME} H5TB H5GLOBAL H5LIB H5T H5F) > > #----------------------------------------------------------------------------- > # Add Tests > #----------------------------------------------------------------------------- > ADD_TEST(tstimage ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/tstimage) > ADD_TEST(tstlite ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/tstlite) > ADD_TEST(tsttable ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/tsttable) Only in Cmake-1.8.5-contrib/hl/src: CMakeLists.txt diff -r Cmake-1.8.5-contrib/hl/test/CMakeLists.txt Cmake-initial-contrib/hl/test/CMakeLists.txt 1d0 < cmake_minimum_required (VERSION 2.8) 3c2 < # Notes: When creating unit test executables they should be prefixed --- > # Notes: When creating unit test executables they should be prefixed 10c9,10 < PROJECT (HDF5_HL_TEST) --- > PROJECT( HDF5_HL_TEST) > cmake_minimum_required(VERSION 2.6) 13c13 < # Generate the H5srcdir_str.h file containing user settings needed by compilation --- > # Setup output Directories 15,16c15,27 < SET (srcdir ${CMAKE_CURRENT_SOURCE_DIR}) < CONFIGURE_FILE (${HDF5_HL_TEST_SOURCE_DIR}/H5srcdir_str.h.in H5srcdir_str.h @ONLY) --- > IF(NOT HDF5_EXTERNALLY_CONFIGURED) > SET (CMAKE_RUNTIME_OUTPUT_DIRECTORY > ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all Executables." > ) > SET (CMAKE_LIBRARY_OUTPUT_DIRECTORY > ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all Libraries" > ) > SET (CMAKE_ARCHIVE_OUTPUT_DIRECTORY > ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all static libraries." > ) > ENDIF(NOT HDF5_EXTERNALLY_CONFIGURED) > > INCLUDE_DIRECTORIES( ${HDF5_TEST_SOURCE_DIR} ) 18,19d28 < INCLUDE_DIRECTORIES (${CMAKE_CURRENT_BINARY_DIR}) < INCLUDE_DIRECTORIES (${HDF5_TEST_SOURCE_DIR}) 24,33c33,59 < MACRO (HL_ADD_TEST hl_name files) < ADD_EXECUTABLE (hl_${hl_name} ${hl_name}.c) < H5_NAMING (hl_${hl_name}) < TARGET_LINK_LIBRARIES (hl_${hl_name} < ${HDF5_HL_LIB_TARGET} < ${HDF5_LIB_TARGET} < ${HDF5_TEST_LIB_TARGET} < ) < < ADD_TEST (NAME hl_${hl_name} COMMAND $) --- > macro (HL_ADD_TEST hl_name files) > ADD_EXECUTABLE(hl_${hl_name} ${hl_name}.c ) > TARGET_LINK_LIBRARIES(hl_${hl_name} > ${HDF5_HL_LIB_NAME} > ${HDF5_LIB_NAME} > ${HDF5_TEST_LIB_NAME} ) > ADD_TEST(hl_${hl_name} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/hl_${hl_name}) > > #-- Copy the necessary files. > FOREACH ( h5_file ${files} ) > SET (dest "${HDF5_HL_TEST_BINARY_DIR}/${h5_file}") > #MESSAGE(STATUS " Copying HL Test File ${h5_file} to ${dest}") > ADD_CUSTOM_COMMAND ( > TARGET hl_${hl_name} > PRE_BUILD > COMMAND ${CMAKE_COMMAND} > ARGS -E copy_if_different ${HDF5_HL_TEST_SOURCE_DIR}/${h5_file} ${dest} > ) > > ENDFOREACH ( h5_file ${HL_REFERENCE_TEST_FILES} ) > endmacro(HL_ADD_TEST hl_name) > > HL_ADD_TEST( test_ds "dsdata.txt;dslat.txt;dslon.txt;test_ds_be.h5;test_ds_le.h5") > HL_ADD_TEST( test_image "image8.txt;sepia.pal;earth.pal;image24pixel.txt;image24plane.txt;usa.wri") > HL_ADD_TEST( test_lite "dtype_file.txt") > HL_ADD_TEST( test_packet "") > HL_ADD_TEST( test_table "test_table_be.hdf5;test_table_cray.hdf5;test_table_le.hdf5") 35,53d60 < #-- Copy the necessary files. < FOREACH (h5_file ${files}) < SET (dest "${HDF5_HL_TEST_BINARY_DIR}/${h5_file}") < #MESSAGE (STATUS " Copying HL Test File ${h5_file} to ${dest}") < ADD_CUSTOM_COMMAND ( < TARGET hl_${hl_name} < PRE_BUILD < COMMAND ${CMAKE_COMMAND} < ARGS -E copy_if_different ${HDF5_HL_TEST_SOURCE_DIR}/${h5_file} ${dest} < ) < < ENDFOREACH (h5_file ${HL_REFERENCE_TEST_FILES}) < ENDMACRO (HL_ADD_TEST) < < HL_ADD_TEST (test_ds "dsdata.txt;dslat.txt;dslon.txt;test_ds_be.h5;test_ds_le.h5") < HL_ADD_TEST (test_image "image8.txt;sepia.pal;earth.pal;image24pixel.txt;image24plane.txt;usa.wri") < HL_ADD_TEST (test_lite "dtype_file.txt") < HL_ADD_TEST (test_packet "") < HL_ADD_TEST (test_table "test_table_be.hdf5;test_table_cray.hdf5;test_table_le.hdf5") 59,67c66,72 < IF (NOT BUILD_SHARED_LIBS) < ADD_EXECUTABLE (hl_gen_test_ds gen_test_ds.c) < H5_NAMING (hl_gen_test_ds) < TARGET_LINK_LIBRARIES (hl_gen_test_ds < ${HDF5_HL_LIB_TARGET} < ${HDF5_LIB_TARGET} < ${HDF5_TEST_LIB_TARGET} < ) < ENDIF (NOT BUILD_SHARED_LIBS) --- > ADD_EXECUTABLE(hl_gen_test_ds gen_test_ds.c ) > TARGET_LINK_LIBRARIES(hl_gen_test_ds > ${HDF5_HL_LIB_NAME} > ${HDF5_LIB_NAME} > ${HDF5_TEST_LIB_NAME} ) > > \ No newline at end of file diff -r Cmake-1.8.5-contrib/hl/tools/CMakeLists.txt Cmake-initial-contrib/hl/tools/CMakeLists.txt 1,2c1,3 < cmake_minimum_required (VERSION 2.8) < PROJECT (HDF5_HL_TOOLS) --- > # set project's name > PROJECT( HDF5_HL_TOOLS ) > cmake_minimum_required(VERSION 2.6) 5c6 < # Define Sources --- > # Setup output Directories 7,23c8,34 < SET (GIF2H5_SRCS < ${HDF5_HL_TOOLS_SOURCE_DIR}/gif2h5/gif.h < ${HDF5_HL_TOOLS_SOURCE_DIR}/gif2h5/decompress.c < ${HDF5_HL_TOOLS_SOURCE_DIR}/gif2h5/gif2hdf.c < ${HDF5_HL_TOOLS_SOURCE_DIR}/gif2h5/gif2mem.c < ${HDF5_HL_TOOLS_SOURCE_DIR}/gif2h5/gifread.c < ${HDF5_HL_TOOLS_SOURCE_DIR}/gif2h5/writehdf.c < ) < < #-- Add gif2hdf5 program < INCLUDE_DIRECTORIES (${HDF5_TOOLS_SOURCE_DIR}/lib) < INCLUDE_DIRECTORIES (${HDF5_HL_TOOLS_SOURCE_DIR}/gif2h5) < < ADD_EXECUTABLE (gif2h5 ${GIF2H5_SRCS}) < H5_NAMING (gif2h5) < TARGET_LINK_LIBRARIES (gif2h5 ${HDF5_HL_LIB_TARGET} ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET}) < --- > IF(NOT HDF5_EXTERNALLY_CONFIGURED) > SET (CMAKE_RUNTIME_OUTPUT_DIRECTORY > ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all Executables." > ) > SET (CMAKE_LIBRARY_OUTPUT_DIRECTORY > ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all Libraries" > ) > SET (CMAKE_ARCHIVE_OUTPUT_DIRECTORY > ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all static libraries." > ) > ENDIF(NOT HDF5_EXTERNALLY_CONFIGURED) > > SET ( GIF2H5_SRCS > ${HDF5_HL_TOOLS_SOURCE_DIR}/gif2h5/gif.h > ${HDF5_HL_TOOLS_SOURCE_DIR}/gif2h5/decompress.c > ${HDF5_HL_TOOLS_SOURCE_DIR}/gif2h5/gif2hdf.c > ${HDF5_HL_TOOLS_SOURCE_DIR}/gif2h5/gif2mem.c > ${HDF5_HL_TOOLS_SOURCE_DIR}/gif2h5/gifread.c > ${HDF5_HL_TOOLS_SOURCE_DIR}/gif2h5/writehdf.c > ${HDF5_TOOLS_SOURCE_DIR}/lib/h5tools_utils.c ) > > #-- Add gif2hdf5 program > include_directories(${HDF5_TOOLS_SOURCE_DIR}/lib) > include_directories(${HDF5_HL_TOOLS_SOURCE_DIR}/gif2h5) > ADD_EXECUTABLE(gif2h5 ${GIF2H5_SRCS}) > TARGET_LINK_LIBRARIES(gif2h5 ${HDF5_HL_LIB_NAME} ${HDF5_LIB_NAME} ${HDF5_TOOLS_LIB_NAME} ) > 25,27c36,39 < SET (hdf2gif_SRCS < ${HDF5_HL_TOOLS_SOURCE_DIR}/gif2h5/hdf2gif.c < ${HDF5_HL_TOOLS_SOURCE_DIR}/gif2h5/hdfgifwr.c --- > set (hdf2gif_SRCS > ${HDF5_TOOLS_SOURCE_DIR}/lib/h5tools_utils.c > ${HDF5_HL_TOOLS_SOURCE_DIR}/gif2h5/hdf2gif.c > ${HDF5_HL_TOOLS_SOURCE_DIR}/gif2h5/hdfgifwr.c 29,32c41,48 < ADD_EXECUTABLE (hdf2gif ${hdf2gif_SRCS}) < H5_NAMING (hdf2gif) < TARGET_LINK_LIBRARIES (hdf2gif ${HDF5_HL_LIB_TARGET} ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET}) < --- > ADD_EXECUTABLE(hdf2gif ${hdf2gif_SRCS}) > TARGET_LINK_LIBRARIES(hdf2gif ${HDF5_HL_LIB_NAME} ${HDF5_LIB_NAME} ${HDF5_TOOLS_LIB_NAME} ) > > #--- Set up the installation Code for Make Install > INSTALL(TARGETS gif2h5 hdf2gif > RUNTIME DESTINATION bin > ) > 34c50 < # This executable can generate the actual test files - Currently not --- > # This executable can generate the actual test files - Currently not 38,44c54,58 < IF (NOT BUILD_SHARED_LIBS) < ADD_EXECUTABLE (hl_h52gifgentest ${HDF5_HL_TOOLS_SOURCE_DIR}/gif2h5/h52gifgentst.c) < H5_NAMING (hl_h52gifgentest) < TARGET_LINK_LIBRARIES (hl_h52gifgentest ${HDF5_HL_LIB_TARGET} ${HDF5_LIB_TARGET}) < < # ADD_TEST (NAME hl_h52gifgentest COMMAND $) < ENDIF (NOT BUILD_SHARED_LIBS) --- > IF(BUILD_TESTING) > ADD_EXECUTABLE(hl_h52gifgentest ${HDF5_HL_TOOLS_SOURCE_DIR}/gif2h5/h52gifgentst.c) > TARGET_LINK_LIBRARIES(hl_h52gifgentest ${HDF5_HL_LIB_NAME} ${HDF5_LIB_NAME} ) > # ADD_TEST(hl_h52gifgentest ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/hl_h52gifgentest) > ENDIF(BUILD_TESTING) 46,55d59 < #----------------------------------------------------------------------------- < # Add file(s) to CMake Install < #----------------------------------------------------------------------------- < INSTALL ( < TARGETS < gif2h5 < hdf2gif < RUNTIME DESTINATION < bin/tools < ) Only in Cmake-initial-contrib: LibSources.cmake diff -r Cmake-1.8.5-contrib/perform/CMakeLists.txt Cmake-initial-contrib/perform/CMakeLists.txt 1,2c1,3 < cmake_minimum_required (VERSION 2.8) < PROJECT (HDF5_PERFORM ) --- > # set project's name > PROJECT( HDF5_PERFORM ) > cmake_minimum_required(VERSION 2.6) 5c6 < # Setup include Directories --- > # Setup output Directories 7,8c8,18 < INCLUDE_DIRECTORIES (${HDF5_TEST_SOURCE_DIR}) < INCLUDE_DIRECTORIES (${HDF5_TOOLS_SOURCE_DIR}/lib ) --- > IF(NOT HDF5_EXTERNALLY_CONFIGURED) > SET (CMAKE_RUNTIME_OUTPUT_DIRECTORY > ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all Executables." > ) > SET (CMAKE_LIBRARY_OUTPUT_DIRECTORY > ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all Libraries" > ) > SET (CMAKE_ARCHIVE_OUTPUT_DIRECTORY > ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all static libraries." > ) > ENDIF(NOT HDF5_EXTERNALLY_CONFIGURED) 11c21 < # Add Tests --- > # Setup output Directories 12a23,37 > IF(NOT HDF5_EXTERNALLY_CONFIGURED) > SET (CMAKE_RUNTIME_OUTPUT_DIRECTORY > ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all Executables." > ) > SET (CMAKE_LIBRARY_OUTPUT_DIRECTORY > ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all Libraries" > ) > SET (CMAKE_ARCHIVE_OUTPUT_DIRECTORY > ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all static libraries." > ) > ENDIF(NOT HDF5_EXTERNALLY_CONFIGURED) > > include_directories( ${HDF5_TEST_SOURCE_DIR} ) > include_directories( ${HDF5_TOOLS_SOURCE_DIR}/lib ) > 15c40 < SET (h5perf_serial_SRCS --- > set (h5perf_serial_SRCS 20,22c45,47 < ADD_EXECUTABLE (h5perf_serial ${h5perf_serial_SRCS}) < H5_NAMING (h5perf_serial) < TARGET_LINK_LIBRARIES (h5perf_serial ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET}) --- > ADD_EXECUTABLE(h5perf_serial ${h5perf_serial_SRCS}) > TARGET_LINK_LIBRARIES(h5perf_serial ${HDF5_LIB_NAME} ${HDF5_TOOLS_LIB_NAME} ) > ADD_TEST(h5perf_serial ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/h5perf_serial) 24d48 < ADD_TEST (NAME h5perf_serial COMMAND $) 27c51 < SET (chunk_SRCS --- > set (chunk_SRCS 31,32c55,56 < H5_NAMING (chunk) < TARGET_LINK_LIBRARIES(chunk ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET}) --- > TARGET_LINK_LIBRARIES(chunk ${HDF5_LIB_NAME} ${HDF5_TOOLS_LIB_NAME} ) > ADD_TEST(chunk ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/chunk) 34d57 < ADD_TEST (NAME chunk COMMAND $) 37c60 < SET (iopipe_SRCS --- > set (iopipe_SRCS 40,44c63,65 < ADD_EXECUTABLE (iopipe ${iopipe_SRCS}) < H5_NAMING (iopipe) < TARGET_LINK_LIBRARIES (iopipe ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET}) < < ADD_TEST (NAME iopipe COMMAND $) --- > ADD_EXECUTABLE(iopipe ${iopipe_SRCS}) > TARGET_LINK_LIBRARIES(iopipe ${HDF5_LIB_NAME} ${HDF5_TOOLS_LIB_NAME} ) > ADD_TEST(iopipe ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/iopipe) 47c68 < SET (overhead_SRCS --- > set (overhead_SRCS 50,54c71,73 < ADD_EXECUTABLE (overhead ${overhead_SRCS}) < H5_NAMING (overhead) < TARGET_LINK_LIBRARIES (overhead ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET}) < < ADD_TEST (NAME overhead COMMAND $) --- > ADD_EXECUTABLE(overhead ${overhead_SRCS}) > TARGET_LINK_LIBRARIES(overhead ${HDF5_LIB_NAME} ${HDF5_TOOLS_LIB_NAME} ) > ADD_TEST(overhead ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/overhead) 57c76 < SET (perf_meta_SRCS --- > set (perf_meta_SRCS 60,62c79,81 < ADD_EXECUTABLE (perf_meta ${perf_meta_SRCS}) < H5_NAMING (perf_meta) < TARGET_LINK_LIBRARIES (perf_meta ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET} ${HDF5_TEST_LIB_TARGET}) --- > ADD_EXECUTABLE(perf_meta ${perf_meta_SRCS}) > TARGET_LINK_LIBRARIES(perf_meta ${HDF5_LIB_NAME} ${HDF5_TOOLS_LIB_NAME} ${HDF5_TEST_LIB_NAME}) > ADD_TEST(perf_meta ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/perf_meta) 64d82 < ADD_TEST (NAME perf_meta COMMAND $) 67c85 < SET (zip_perf_SRCS --- > set (zip_perf_SRCS 70,72c88,91 < ADD_EXECUTABLE (zip_perf ${zip_perf_SRCS}) < H5_NAMING (zip_perf) < TARGET_LINK_LIBRARIES (zip_perf ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET}) --- > ADD_EXECUTABLE(zip_perf ${zip_perf_SRCS}) > TARGET_LINK_LIBRARIES(zip_perf ${HDF5_TOOLS_LIB_NAME} ${HDF5_LIB_NAME}) > ADD_TEST(zip_perf ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/zip_perf) > 74d92 < ADD_TEST (NAME zip_perf COMMAND $ "-h") diff -r Cmake-1.8.5-contrib/Resources/CheckTypeSize.cmake Cmake-initial-contrib/Resources/CheckTypeSize.cmake 10,18c10,18 < MACRO (HDF_CHECK_TYPE_SIZE TYPE VARIABLE) < SET (CMAKE_ALLOW_UNKNOWN_VARIABLE_READ_ACCESS 1) < IF ("HAVE_${VARIABLE}" MATCHES "^HAVE_${VARIABLE}$") < SET (MACRO_CHECK_TYPE_SIZE_FLAGS < "-DCHECK_TYPE_SIZE_TYPE=\"${TYPE}\" ${CMAKE_REQUIRED_FLAGS}" < ) < FOREACH (def HAVE_SYS_TYPES_H HAVE_STDINT_H HAVE_STDDEF_H HAVE_INTTYPES_H) < IF ("${def}") < SET (MACRO_CHECK_TYPE_SIZE_FLAGS "${MACRO_CHECK_TYPE_SIZE_FLAGS} -D${def}") --- > MACRO(HDF_CHECK_TYPE_SIZE TYPE VARIABLE) > SET(CMAKE_ALLOW_UNKNOWN_VARIABLE_READ_ACCESS 1) > IF("HAVE_${VARIABLE}" MATCHES "^HAVE_${VARIABLE}$") > SET(MACRO_CHECK_TYPE_SIZE_FLAGS > "-DCHECK_TYPE_SIZE_TYPE=\"${TYPE}\" ${CMAKE_REQUIRED_FLAGS}") > FOREACH(def HAVE_SYS_TYPES_H HAVE_STDINT_H HAVE_STDDEF_H HAVE_INTTYPES_H) > IF("${def}") > SET(MACRO_CHECK_TYPE_SIZE_FLAGS > "${MACRO_CHECK_TYPE_SIZE_FLAGS} -D${def}") 20,48c20,43 < ENDFOREACH (def) < < MESSAGE (STATUS "Check size of ${TYPE}") < IF (CMAKE_REQUIRED_LIBRARIES) < SET (CHECK_TYPE_SIZE_ADD_LIBRARIES < "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}" < ) < ENDIF (CMAKE_REQUIRED_LIBRARIES) < TRY_RUN (${VARIABLE} HAVE_${VARIABLE} < ${CMAKE_BINARY_DIR} < ${HDF5_PROJECT_DIR}/Resources/CheckTypeSize.c < CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_TYPE_SIZE_FLAGS} < "${CHECK_TYPE_SIZE_ADD_LIBRARIES}" < OUTPUT_VARIABLE OUTPUT < ) < IF (HAVE_${VARIABLE}) < MESSAGE (STATUS "Check size of ${TYPE} - done") < FILE (APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeOutput.log < "Determining size of ${TYPE} passed with the following output:\n${OUTPUT}\n\n" < ) < ELSE (HAVE_${VARIABLE}) < MESSAGE (STATUS "Check size of ${TYPE} - failed") < FILE (APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log < "Determining size of ${TYPE} failed with the following output:\n${OUTPUT}\n\n" < ) < ENDIF (HAVE_${VARIABLE}) < ENDIF ("HAVE_${VARIABLE}" MATCHES "^HAVE_${VARIABLE}$") < SET (CMAKE_ALLOW_UNKNOWN_VARIABLE_READ_ACCESS) < ENDMACRO (HDF_CHECK_TYPE_SIZE) --- > ENDFOREACH(def) > MESSAGE(STATUS "Check size of ${TYPE}") > IF(CMAKE_REQUIRED_LIBRARIES) > SET(CHECK_TYPE_SIZE_ADD_LIBRARIES > "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}") > ENDIF(CMAKE_REQUIRED_LIBRARIES) > TRY_RUN(${VARIABLE} HAVE_${VARIABLE} > ${CMAKE_BINARY_DIR} > ${HDF5_PROJECT_DIR}/Resources/CheckTypeSize.c > CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_TYPE_SIZE_FLAGS} > "${CHECK_TYPE_SIZE_ADD_LIBRARIES}" > OUTPUT_VARIABLE OUTPUT) > IF(HAVE_${VARIABLE}) > MESSAGE(STATUS "Check size of ${TYPE} - done") > FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeOutput.log > "Determining size of ${TYPE} passed with the following output:\n${OUTPUT}\n\n") > ELSE(HAVE_${VARIABLE}) > MESSAGE(STATUS "Check size of ${TYPE} - failed") > FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log > "Determining size of ${TYPE} failed with the following output:\n${OUTPUT}\n\n") > ENDIF(HAVE_${VARIABLE}) > ENDIF("HAVE_${VARIABLE}" MATCHES "^HAVE_${VARIABLE}$") > SET(CMAKE_ALLOW_UNKNOWN_VARIABLE_READ_ACCESS ) > ENDMACRO(HDF_CHECK_TYPE_SIZE) diff -r Cmake-1.8.5-contrib/Resources/CMake/FindSZIP.cmake Cmake-initial-contrib/Resources/CMake/FindSZIP.cmake 1,2c1 < < # - Find SZIP library --- > # - Try to find the SZip library 4d2 < # Find the native SZIP includes and library 6,8c4,6 < # SZIP_INCLUDE_DIRS, where to find tiff.h, etc. < # SZIP_LIBRARIES, libraries to link against to use SZIP. < # SZIP_FOUND, If false, do not try to use SZIP. --- > # SZIP_INCLUDE_DIRS, where to find szip, etc. > # SZIP_LIBRARIES, libraries to link against to use SZIP. > # SZIP_FOUND, If false, do not try to use SZIP. 10,12c8,22 < # SZIP_LIBRARY, where to find the SZIP library. < # SZIP_LIBRARY_DEBUG - Debug version of tiff library < # SZIP_LIBRARY_RELEASE - Release Version of tiff library --- > # SZIP_LIBRARY, where to find the SZIP library. > # SZIP_LIBRARY_DEBUG - Debug version of tiff library > # SZIP_LIBRARY_RELEASE - Release Version of tiff library > # FIND_SZIP_DEBUG - Default to OFF, Turn ON for more Debugging information > > #============================================================================= > # Copyright 2009-2010 Mike Jackson (mike.jackson@bluequartz.net) > # > # Distributed under the OSI-approved BSD License (the "License"); > # see accompanying file Copyright.txt for details. > # > # This software is distributed WITHOUT ANY WARRANTY; without even the > # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. > # See the License for more information. > 14d23 < # MESSAGE (STATUS "Finding Szip library and headers..." ) 30,60c39,69 < # 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 (${basename}_LIBRARY_RELEASE AND NOT ${basename}_LIBRARY_DEBUG) < < # 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 (${basename}_LIBRARY_DEBUG AND NOT ${basename}_LIBRARY_RELEASE) < 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(CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE) < # 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 (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE) < SET (${basename}_LIBRARIES optimized ${${basename}_LIBRARY_RELEASE} debug ${${basename}_LIBRARY_DEBUG}) < ENDIF (${basename}_LIBRARY_DEBUG AND ${basename}_LIBRARY_RELEASE) < < SET (${basename}_LIBRARY ${${basename}_LIBRARY} CACHE FILEPATH "The ${basename} library") < < IF (${basename}_LIBRARY) < SET (${basename}_FOUND 1) < ENDIF (${basename}_LIBRARY) --- > # 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 (${basename}_LIBRARY_RELEASE AND NOT ${basename}_LIBRARY_DEBUG) > > # 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 (${basename}_LIBRARY_DEBUG AND NOT ${basename}_LIBRARY_RELEASE) > 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(CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE) > # 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(CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE) > SET(${basename}_LIBRARIES optimized ${${basename}_LIBRARY_RELEASE} debug ${${basename}_LIBRARY_DEBUG}) > ENDIF (${basename}_LIBRARY_DEBUG AND ${basename}_LIBRARY_RELEASE) > > SET(${basename}_LIBRARY ${${basename}_LIBRARY} CACHE FILEPATH "The ${basename} library") > > IF (${basename}_LIBRARY) > SET(${basename}_FOUND 1) > ENDIF (${basename}_LIBRARY) 65c74 < MARK_AS_ADVANCED (${basename}_LIBRARY ${basename}_LIBRARY_RELEASE ${basename}_LIBRARY_DEBUG ${basename}_INCLUDE_DIR ) --- > MARK_AS_ADVANCED(${basename}_LIBRARY ${basename}_LIBRARY_RELEASE ${basename}_LIBRARY_DEBUG ${basename}_INCLUDE_DIR ) 70,74c79,81 < SET (SZIP_INCLUDE_SEARCH_DIRS < $ENV{SZIP_INSTALL}/include < $ENV{SZIP_INSTALL}/include/szip < /usr/include < /usr/include/szip --- > SET(SZIP_INCLUDE_SEARCH_DIRS > $ENV{SZIP_INSTALL}/include > $ENV{SZIP_INSTALL}/include/szip 78,80c85,86 < $ENV{SZIP_INSTALL}/lib < /usr/lib < ) --- > $ENV{SZIP_INSTALL}/lib > ) 83,84c89 < $ENV{SZIP_INSTALL}/bin < /usr/bin --- > $ENV{SZIP_INSTALL}/bin 87,90c92,95 < FIND_PATH (SZIP_INCLUDE_DIR < NAMES szlib.h < PATHS ${SZIP_INCLUDE_SEARCH_DIRS} < NO_DEFAULT_PATH --- > FIND_PATH(SZIP_INCLUDE_DIR > NAMES szlib.h > PATHS ${SZIP_INCLUDE_SEARCH_DIRS} > NO_DEFAULT_PATH 99c104 < ENDIF (WIN32 AND NOT MINGW) --- > ENDIF(WIN32 AND NOT MINGW) 102,112c107,117 < 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 < ) --- > 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 > ) 114c119 < SZIP_ADJUST_LIB_VARS (SZIP) --- > SZIP_ADJUST_LIB_VARS(SZIP) 116,119c121,124 < 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_INCLUDE_DIR AND SZIP_LIBRARY) > SET(SZIP_FOUND 1) > SET(SZIP_LIBRARIES ${SZIP_LIBRARY}) > SET(SZIP_INCLUDE_DIRS ${SZIP_INCLUDE_DIR}) 121,132c126,137 < GET_FILENAME_COMPONENT (SZIP_LIBRARY_PATH ${SZIP_LIBRARY_DEBUG} PATH) < SET (SZIP_LIB_DIR ${SZIP_LIBRARY_PATH}) < ELSEIF (SZIP_LIBRARY_RELEASE) < GET_FILENAME_COMPONENT (SZIP_LIBRARY_PATH ${SZIP_LIBRARY_RELEASE} PATH) < SET (SZIP_LIB_DIR ${SZIP_LIBRARY_PATH}) < ENDIF (SZIP_LIBRARY_DEBUG) < < ELSE (SZIP_INCLUDE_DIR AND SZIP_LIBRARY) < SET (SZIP_FOUND 0) < SET (SZIP_LIBRARIES) < SET (SZIP_INCLUDE_DIRS) < ENDIF (SZIP_INCLUDE_DIR AND SZIP_LIBRARY) --- > GET_FILENAME_COMPONENT(SZIP_LIBRARY_PATH ${SZIP_LIBRARY_DEBUG} PATH) > SET(SZIP_LIB_DIR ${SZIP_LIBRARY_PATH}) > ELSEIF(SZIP_LIBRARY_RELEASE) > GET_FILENAME_COMPONENT(SZIP_LIBRARY_PATH ${SZIP_LIBRARY_RELEASE} PATH) > SET(SZIP_LIB_DIR ${SZIP_LIBRARY_PATH}) > ENDIF(SZIP_LIBRARY_DEBUG) > > ELSE(SZIP_INCLUDE_DIR AND SZIP_LIBRARY) > SET(SZIP_FOUND 0) > SET(SZIP_LIBRARIES) > SET(SZIP_INCLUDE_DIRS) > ENDIF(SZIP_INCLUDE_DIR AND SZIP_LIBRARY) 135,147c140,159 < IF (NOT SZIP_FOUND) < SET (SZIP_DIR_MESSAGE < "SZip was not found. Make sure SZIP_LIBRARY and SZIP_INCLUDE_DIR are set or set the SZIP_INSTALL environment variable." < ) < IF (NOT SZIP_FIND_QUIETLY) < MESSAGE (STATUS "${SZIP_DIR_MESSAGE}") < ELSE (NOT SZIP_FIND_QUIETLY) < IF (SZIP_FIND_REQUIRED) < MESSAGE (FATAL_ERROR "SZip was NOT found and is Required by this project") < ENDIF (SZIP_FIND_REQUIRED) < ENDIF (NOT SZIP_FIND_QUIETLY) < ENDIF (NOT SZIP_FOUND) < --- > IF(NOT SZIP_FOUND) > SET(SZIP_DIR_MESSAGE > "SZip was not found. Make sure SZIP_LIBRARY and SZIP_INCLUDE_DIR are set or set the SZIP_INSTALL environment variable.") > IF(NOT SZIP_FIND_QUIETLY) > MESSAGE(STATUS "${SZIP_DIR_MESSAGE}") > ELSE(NOT SZIP_FIND_QUIETLY) > IF(SZIP_FIND_REQUIRED) > MESSAGE(FATAL_ERROR "SZip was NOT found and is Required by this project") > ENDIF(SZIP_FIND_REQUIRED) > ENDIF(NOT SZIP_FIND_QUIETLY) > ENDIF(NOT SZIP_FOUND) > > > # -------------------------------------------------------------------- > # This next section was added to aid in the determination if the SZip > # library was built as a Dynamic Library or a static library. This is > # needed for some defintions and sometimes helps to debug other problems > # during configuration and building. Normally the SZip package compilation > # from the official SZip web site does NOT define this. The CMake version > # located at http://www.gitorious.com/hdf5/szip 149,152c161,162 < INCLUDE (CheckSymbolExists) < ############################################# < # Find out if SZIP was build using dll's < ############################################# --- > INCLUDE(CheckSymbolExists) > #-------------------------------------------- 154,155c164,165 < SET (CMAKE_REQUIRED_INCLUDES_SAVE ${CMAKE_REQUIRED_INCLUDES}) < SET (CMAKE_REQUIRED_FLAGS_SAVE ${CMAKE_REQUIRED_FLAGS}) --- > SET(CMAKE_REQUIRED_INCLUDES_SAVE ${CMAKE_REQUIRED_INCLUDES}) > SET(CMAKE_REQUIRED_FLAGS_SAVE ${CMAKE_REQUIRED_FLAGS}) 157c167 < SET (CMAKE_REQUIRED_INCLUDES "${CMAKE_REQUIRED_INCLUDES};${SZIP_INCLUDE_DIRS}") --- > SET(CMAKE_REQUIRED_INCLUDES "${CMAKE_REQUIRED_INCLUDES};${SZIP_INCLUDE_DIRS}") 159c169 < CHECK_SYMBOL_EXISTS (SZIP_BUILT_AS_DYNAMIC_LIB "SZconfig.h" HAVE_SZIP_DLL) --- > CHECK_SYMBOL_EXISTS(SZIP_BUILT_AS_DYNAMIC_LIB "SZconfig.h" HAVE_SZIP_DLL) 166,169c176,178 < SET (CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES_SAVE}) < SET (CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS_SAVE}) < # < ############################################# --- > SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES_SAVE}) > SET(CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS_SAVE}) > 173,179c182,189 < 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 "HAVE_SZIP_DLL: ${HAVE_SZIP_DLL}") < MESSAGE (STATUS "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}") < ENDIF (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 "SZIP_LIBRARIES: ${SZIP_LIBRARIES}") > MESSAGE(STATUS "HAVE_SZIP_DLL: ${HAVE_SZIP_DLL}") > > ENDIF() diff -r Cmake-1.8.5-contrib/Resources/H5pubconf.h.in Cmake-initial-contrib/Resources/H5pubconf.h.in 14c14 < #cmakedefine WINDOWS_MAX_BUF (1024 * 1024 * 1024) --- > #cmakedefine H5_WINDOWS_MAX_BUF (1024 * 1024 * 1024) 196,198d195 < /* Define if h5dump packed bits feature is enabled */ < #cmakedefine H5_HAVE_H5DUMP_PACKED_BITS @H5_HAVE_H5DUMP_PACKED_BITS@ < 254,256d250 < /* Define to 1 if you have the `lstat' function. */ < #cmakedefine H5_HAVE_LSTAT @H5_HAVE_LSTAT@ < 344,346d337 < /* Define to 1 if you have the `symlink' function. */ < #cmakedefine H5_HAVE_SYMLINK @H5_HAVE_SYMLINK@ < diff -r Cmake-1.8.5-contrib/Resources/HDF5Macros.cmake Cmake-initial-contrib/Resources/HDF5Macros.cmake 3,4c3,4 < SET (${name} ${value} CACHE INTERNAL "Used to pass variables between directories" FORCE) < ENDMACRO (SET_GLOBAL_VARIABLE) --- > SET(${name} ${value} CACHE INTERNAL "Used to pass variables between directories" FORCE) > ENDMACRO (SET_GLOBAL_VARIABLE name value) 9c9 < STRING (REPLACE "/" "\\\\" source_group_path ${SOURCE_PATH}) --- > STRING(REPLACE "/" "\\\\" source_group_path ${SOURCE_PATH} ) 14c14 < #SET_PROPERTY (SOURCE ${HEADERS} --- > #set_property(SOURCE ${HEADERS} 17c17,18 < ENDMACRO (IDE_GENERATED_PROPERTIES) --- > > ENDMACRO (IDE_GENERATED_PROPERTIES SOURCE_PATH HEADERS SOURCES) 26,27c27,28 < STRING (REPLACE "/" "\\\\" source_group_path ${SOURCE_PATH} ) < source_group (${source_group_path} FILES ${HEADERS} ${SOURCES}) --- > STRING(REPLACE "/" "\\\\" source_group_path ${SOURCE_PATH} ) > source_group(${source_group_path} FILES ${HEADERS} ${SOURCES}) 31c32 < #SET_PROPERTY (SOURCE ${HEADERS} --- > #set_property(SOURCE ${HEADERS} 34d34 < ENDMACRO (IDE_SOURCE_PROPERTIES) 36,48c36 < #------------------------------------------------------------------------------- < MACRO (H5_NAMING target) < IF (WIN32 AND NOT MINGW) < IF (BUILD_SHARED_LIBS) < IF (H5_LEGACY_NAMING) < SET_TARGET_PROPERTIES (${target} PROPERTIES OUTPUT_NAME "dll") < SET_TARGET_PROPERTIES (${target} PROPERTIES PREFIX "${target}") < ELSE (H5_LEGACY_NAMING) < SET_TARGET_PROPERTIES (${target} PROPERTIES OUTPUT_NAME "${target}dll") < ENDIF (H5_LEGACY_NAMING) < ENDIF (BUILD_SHARED_LIBS) < ENDIF (WIN32 AND NOT MINGW) < ENDMACRO (H5_NAMING) --- > ENDMACRO (IDE_SOURCE_PROPERTIES NAME HEADERS SOURCES) 51c39 < MACRO (H5_SET_LIB_OPTIONS libtarget libname libtype) --- > MACRO(H5_SET_LIB_OPTIONS libtarget libname libtype) 53c41 < IF (${libtype} MATCHES "SHARED") --- > IF ( ${libtype} MATCHES "SHARED") 55,61c43,44 < IF (H5_LEGACY_NAMING) < SET (LIB_RELEASE_NAME "${libname}dll") < SET (LIB_DEBUG_NAME "${libname}ddll") < ELSE (H5_LEGACY_NAMING) < SET (LIB_RELEASE_NAME "${libname}") < SET (LIB_DEBUG_NAME "${libname}_D") < ENDIF (H5_LEGACY_NAMING) --- > SET(LIB_RELEASE_NAME "${libname}") > SET(LIB_DEBUG_NAME "${libname}_D") 63,66c46,49 < SET (LIB_RELEASE_NAME "${libname}") < SET (LIB_DEBUG_NAME "${libname}_debug") < ENDIF (WIN32 AND NOT MINGW) < ELSE (${libtype} MATCHES "SHARED") --- > SET(LIB_RELEASE_NAME "${libname}") > SET(LIB_DEBUG_NAME "${libname}_debug") > ENDIF(WIN32 AND NOT MINGW) > ELSE ( ${libtype} MATCHES "SHARED") 68,74c51,52 < IF (H5_LEGACY_NAMING) < SET (LIB_RELEASE_NAME "${libname}") < SET (LIB_DEBUG_NAME "${libname}d") < ELSE (H5_LEGACY_NAMING) < SET (LIB_RELEASE_NAME "lib${libname}") < SET (LIB_DEBUG_NAME "lib${libname}_D") < ENDIF (H5_LEGACY_NAMING) --- > SET(LIB_RELEASE_NAME "lib${libname}") > SET(LIB_DEBUG_NAME "lib${libname}_D") 76,79c54,57 < SET (LIB_RELEASE_NAME "lib${libname}") < SET (LIB_DEBUG_NAME "lib${libname}_debug") < ENDIF (WIN32 AND NOT MINGW) < ENDIF (${libtype} MATCHES "SHARED") --- > SET(LIB_RELEASE_NAME "${libname}") > SET(LIB_DEBUG_NAME "${libname}_debug") > ENDIF(WIN32 AND NOT MINGW) > ENDIF ( ${libtype} MATCHES "SHARED") 81,86c59,64 < SET_TARGET_PROPERTIES (${libtarget} < PROPERTIES < DEBUG_OUTPUT_NAME ${LIB_DEBUG_NAME} < RELEASE_OUTPUT_NAME ${LIB_RELEASE_NAME} < MINSIZEREL_OUTPUT_NAME ${LIB_RELEASE_NAME} < RELWITHDEBINFO_OUTPUT_NAME ${LIB_RELEASE_NAME} --- > SET_TARGET_PROPERTIES( ${libtarget} > PROPERTIES > DEBUG_OUTPUT_NAME ${LIB_DEBUG_NAME} > RELEASE_OUTPUT_NAME ${LIB_RELEASE_NAME} > MINSIZEREL_OUTPUT_NAME ${LIB_RELEASE_NAME} > RELWITHDEBINFO_OUTPUT_NAME ${LIB_RELEASE_NAME} 91,95c69,73 < SET_TARGET_PROPERTIES (${libtarget} < PROPERTIES < IMPORT_SUFFIX ".lib" < IMPORT_PREFIX "" < PREFIX "" --- > SET_TARGET_PROPERTIES( ${libtarget} > PROPERTIES > IMPORT_SUFFIX ".lib" > IMPORT_PREFIX "" > PREFIX "" 100,106c78,84 < IF (WIN32) < SET (LIBHDF_VERSION HDF5_PACKAGE_VERSION_MAJOR) < ELSE (WIN32) < SET (LIBHDF_VERSION ${HDF5_PACKAGE_VERSION}) < ENDIF (WIN32) < SET_TARGET_PROPERTIES (${libtarget} PROPERTIES VERSION ${LIBHDF_VERSION}) < SET_TARGET_PROPERTIES (${libtarget} PROPERTIES SOVERSION ${LIBHDF_VERSION}) --- > IF (WIN32) > SET(LIBHDF_VERSION HDF5_PACKAGE_VERSION_MAJOR) > ELSE (WIN32) > SET(LIBHDF_VERSION ${HDF5_PACKAGE_VERSION}) > ENDIF (WIN32) > SET_TARGET_PROPERTIES(${libtarget} PROPERTIES VERSION ${LIBHDF_VERSION}) > SET_TARGET_PROPERTIES(${libtarget} PROPERTIES SOVERSION ${LIBHDF_VERSION}) 111,118c89,96 < OPTION (HDF5_BUILD_WITH_INSTALL_NAME "Build with library install_name set to the installation path" OFF) < IF (HDF5_BUILD_WITH_INSTALL_NAME) < SET_TARGET_PROPERTIES(${libtarget} PROPERTIES < LINK_FLAGS "-current_version ${HDF5_PACKAGE_VERSION} -compatibility_version ${HDF5_PACKAGE_VERSION}" < INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib" < BUILD_WITH_INSTALL_RPATH ${HDF5_BUILD_WITH_INSTALL_NAME} < ) < ENDIF (HDF5_BUILD_WITH_INSTALL_NAME) --- > OPTION(HDF5_BUILD_WITH_INSTALL_NAME "Build with library install_name set to the installation path" OFF) > if (HDF5_BUILD_WITH_INSTALL_NAME) > SET_TARGET_PROPERTIES(${libtarget} PROPERTIES > LINK_FLAGS "-current_version ${HDF5_PACKAGE_VERSION} -compatibility_version ${HDF5_PACKAGE_VERSION}" > INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib" > BUILD_WITH_INSTALL_RPATH ${HDF5_BUILD_WITH_INSTALL_NAME} > ) > endif() 121c99 < ENDMACRO (H5_SET_LIB_OPTIONS) --- > ENDMACRO(H5_SET_LIB_OPTIONS libname) Only in Cmake-1.8.5-contrib/Resources: libhdf5.settings.cmake.in Only in Cmake-1.8.5-contrib/Resources: runTest.cmake Only in Cmake-1.8.5-contrib/Resources: xlatefile.c Only in Cmake-1.8.5-contrib/src: CMakeLists.txt diff -r Cmake-1.8.5-contrib/src/H5api_adpt.h Cmake-initial-contrib/src/H5api_adpt.h 27,55c27,37 < #if defined (hdf5_EXPORTS) < #define _HDF5DLL_ < #else < #define _HDF5USEDLL_ < #endif < < #if defined (hdf5_test_EXPORTS) < #define _HDF5TESTDLL_ < #else < #define _HDF5TESTUSEDLL_ < #endif < < #if defined (hdf5_tools_EXPORTS) < #define _HDF5TOOLSDLL_ < #else < #define _HDF5TOOLSUSEDLL_ < #endif < < #if defined (hdf5_cpp_EXPORTS) < #define HDF5_CPPDLL_EXPORTS < #else < #define HDF5CPP_USEDLL < #endif < < #if defined (hdf5_hl_EXPORTS) < #define _HDF5_HLDLL_EXPORTS_ < #else < #define _HDF5USEHLDLL_ < #endif --- > # if defined (hdf5_EXPORTS) > # define _HDF5DLL_ > # else > # define _HDF5USEDLL_ > # endif > > # if defined (h5test_EXPORTS) > # define _HDF5TESTDLL_ > # else > # define _HDF5TESTUSEDLL_ > # endif 57,75d38 < #if defined (hdf5_hl_cpp_EXPORTS) < #define HDF5_HL_CPPDLL_EXPORTS < #else < #define HDF5USE_HLCPPDLL < #endif < < #if defined (hdf5_f90CStub_EXPORTS) < #define HDF5FORT_CSTUB_DLL_EXPORTS < #else < #define HDF5FORT_CSTUB_USEDLL < #endif < < #if defined (hdf5_test_f90CStub_EXPORTS) < #define HDF5FORTTEST_CSTUB_DLL_EXPORTS < #endif < < #if defined (hdf5_hl_f90CStub_EXPORTS) < #define HDF5_HL_F90CSTUBDLL_EXPORTS < #endif 96,97c59,60 < #define H5_DLL < #define H5_DLLVAR extern --- > #define H5_DLL > #define H5_DLLVAR extern 100c63,66 < #if defined(hdf5_test_EXPORTS) --- > > > > #if defined(h5test_EXPORTS) 119,120c85,86 < #define H5TEST_DLL < #define H5TEST_DLLVAR extern --- > #define H5TEST_DLL > #define H5TEST_DLLVAR extern 123,144d88 < #if defined(hdf5_tools_EXPORTS) < #if defined (_MSC_VER) /* MSVC Compiler Case */ < #define H5TOOLS_DLL __declspec(dllexport) < #define H5TOOLS_DLLVAR extern __declspec(dllexport) < #elif (__GNUC__ >= 4) /* GCC 4.x has support for visibility options */ < #define H5TOOLS_DLL __attribute__ ((visibility("default"))) < #define H5TOOLS_DLLVAR extern __attribute__ ((visibility("default"))) < #endif < #else < #if defined (_MSC_VER) /* MSVC Compiler Case */ < #define H5TOOLS_DLL __declspec(dllimport) < #define H5TOOLS_DLLVAR __declspec(dllimport) < #elif (__GNUC__ >= 4) /* GCC 4.x has support for visibility options */ < #define H5TOOLS_DLL __attribute__ ((visibility("default"))) < #define H5TOOLS_DLLVAR extern __attribute__ ((visibility("default"))) < #endif < #endif < < #ifndef H5TOOLS_DLL < #define H5TOOLS_DLL < #define H5TOOLS_DLLVAR extern < #endif /* H5TOOLS_DLL */ 165,166c109,110 < #define H5_DLLCPP < #define H5_DLLCPPVAR extern --- > #define H5_DLLCPP > #define H5_DLLCPPVAR extern 168a113 > 188,189c133,134 < #define H5_HLDLL < #define H5_HLDLLVAR extern --- > #define H5_HLDLL > #define H5_HLDLLVAR extern 191a137,138 > > 211,212c158,159 < #define H5_HLCPPDLL < #define H5_HLCPPDLLVAR extern --- > #define H5_HLCPPDLL > #define H5_HLCPPDLLVAR extern 214a162,189 > > > > #if defined(hdf5_hl_f90CStub_EXPORTS) > #if defined (_MSC_VER) /* MSVC Compiler Case */ > #define HDF5_HL_F90CSTUBDLL __declspec(dllexport) > #define HDF5_HL_F90CSTUBDLLVAR extern __declspec(dllexport) > #elif (__GNUC__ >= 4) /* GCC 4.x has support for visibility options */ > #define HDF5_HL_F90CSTUBDLL __attribute__ ((visibility("default"))) > #define HDF5_HL_F90CSTUBDLLVAR extern __attribute__ ((visibility("default"))) > #endif > #else > #if defined (_MSC_VER) /* MSVC Compiler Case */ > #define HDF5_HL_F90CSTUBDLL __declspec(dllimport) > #define HDF5_HL_F90CSTUBDLLVAR __declspec(dllimport) > #elif (__GNUC__ >= 4) /* GCC 4.x has support for visibility options */ > #define HDF5_HL_F90CSTUBDLL __attribute__ ((visibility("default"))) > #define HDF5_HL_F90CSTUBDLLVAR extern __attribute__ ((visibility("default"))) > #endif > #endif > > #ifndef HDF5_HL_F90CSTUBDLL > #define HDF5_HL_F90CSTUBDLL > #define HDF5_HL_F90CSTUBDLLVAR extern > #endif /* HDF5_HL_F90CSTUBDLL */ > > > 234,235c209,210 < #define H5_FCDLL < #define H5_FCDLLVAR extern --- > #define H5_FCDLL > #define H5_FCDLLVAR extern 237a213,214 > > 257,258c234,235 < #define H5_FCTESTDLL < #define H5_FCTESTDLLVAR extern --- > #define H5_FCTESTDLL > #define H5_FCTESTDLLVAR extern 261,282d237 < #if defined(hdf5_hl_f90CStub_EXPORTS) < #if defined (_MSC_VER) /* MSVC Compiler Case */ < #define HDF5_HL_F90CSTUBDLL __declspec(dllexport) < #define HDF5_HL_F90CSTUBDLLVAR extern __declspec(dllexport) < #elif (__GNUC__ >= 4) /* GCC 4.x has support for visibility options */ < #define HDF5_HL_F90CSTUBDLL __attribute__ ((visibility("default"))) < #define HDF5_HL_F90CSTUBDLLVAR extern __attribute__ ((visibility("default"))) < #endif < #else < #if defined (_MSC_VER) /* MSVC Compiler Case */ < #define HDF5_HL_F90CSTUBDLL __declspec(dllimport) < #define HDF5_HL_F90CSTUBDLLVAR __declspec(dllimport) < #elif (__GNUC__ >= 4) /* GCC 4.x has support for visibility options */ < #define HDF5_HL_F90CSTUBDLL __attribute__ ((visibility("default"))) < #define HDF5_HL_F90CSTUBDLLVAR extern __attribute__ ((visibility("default"))) < #endif < #endif < < #ifndef HDF5_HL_F90CSTUBDLL < #define HDF5_HL_F90CSTUBDLL < #define HDF5_HL_F90CSTUBDLLVAR extern < #endif /* HDF5_HL_F90CSTUBDLL */ 284d238 < #else 287d240 < * This will be removed after the next release. 288a242 > #else 316,327d269 < #if defined(_HDF5TOOLSDLL_) < #pragma warning(disable: 4273) /* Disable the dll linkage warnings */ < #define H5TOOLS_DLL __declspec(dllexport) < #define H5TOOLS_DLLVAR extern __declspec(dllexport) < #elif defined(_HDF5TOOLSUSEDLL_) < #define H5TOOLS_DLL __declspec(dllimport) < #define H5TOOLS_DLLVAR __declspec(dllimport) < #else < #define H5TOOLS_DLL < #define H5TOOLS_DLLVAR extern < #endif /* _HDF5TOOLSDLL_ */ < 398,399d339 < #define H5TOOLS_DLL < #define H5TOOLS_DLLVAR extern diff -r Cmake-1.8.5-contrib/test/CMakeLists.txt Cmake-initial-contrib/test/CMakeLists.txt 1d0 < cmake_minimum_required (VERSION 2.8) 5c4 < # Define Sources --- > # Setup output Directories 7,10c6,21 < SET (TEST_LIB_SRCS < ${HDF5_TEST_SOURCE_DIR}/h5test.c < ${HDF5_TEST_SOURCE_DIR}/testframe.c < ${HDF5_TEST_SOURCE_DIR}/cache_common.c --- > IF(NOT HDF5_EXTERNALLY_CONFIGURED) > SET (CMAKE_RUNTIME_OUTPUT_DIRECTORY > ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all Executables." > ) > SET (CMAKE_LIBRARY_OUTPUT_DIRECTORY > ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all Libraries" > ) > SET (CMAKE_ARCHIVE_OUTPUT_DIRECTORY > ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all static libraries." > ) > ENDIF(NOT HDF5_EXTERNALLY_CONFIGURED) > > > SET (TEST_LIB_SRCS > ${HDF5_TEST_SOURCE_DIR}/h5test.c > ${HDF5_TEST_SOURCE_DIR}/testframe.c 14c25 < ${HDF5_TEST_SOURCE_DIR}/h5test.h --- > ${HDF5_TEST_SOURCE_DIR}/h5test.h 17,32c28,32 < #----------------------------------------------------------------------------- < # Generate the H5srcdir_str.h file containing user settings needed by compilation < #----------------------------------------------------------------------------- < SET (srcdir ${CMAKE_CURRENT_SOURCE_DIR}) < CONFIGURE_FILE (${HDF5_TEST_SOURCE_DIR}/H5srcdir_str.h.in H5srcdir_str.h @ONLY) < INCLUDE_DIRECTORIES (${CMAKE_CURRENT_BINARY_DIR}) < < ADD_LIBRARY (${HDF5_TEST_LIB_TARGET} ${LIB_TYPE} ${TEST_LIB_SRCS} ${TEST_LIB_HEADERS}) < IF (BUILD_SHARED_LIBS) < IF (MSVC) < TARGET_LINK_LIBRARIES (${HDF5_TEST_LIB_TARGET} "ws2_32.lib") < ENDIF (MSVC) < ENDIF (BUILD_SHARED_LIBS) < TARGET_LINK_LIBRARIES (${HDF5_TEST_LIB_TARGET} ${HDF5_LIB_TARGET}) < SET_GLOBAL_VARIABLE (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_TEST_LIB_TARGET}") < H5_SET_LIB_OPTIONS (${HDF5_TEST_LIB_TARGET} ${HDF5_TEST_LIB_NAME} ${LIB_TYPE}) --- > #-- Add a library for the ${HDF5_TEST_LIB_NAME} > ADD_LIBRARY (${HDF5_TEST_LIB_NAME} ${LIB_TYPE} ${TEST_LIB_SRCS} ${TEST_LIB_HEADERS} ) > SET_GLOBAL_VARIABLE(HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_TEST_LIB_NAME}") > TARGET_LINK_LIBRARIES(${HDF5_TEST_LIB_NAME} ${HDF5_LIB_NAME}) > H5_SET_LIB_OPTIONS(${HDF5_TEST_LIB_NAME} ${HDF5_TEST_LIB_NAME} ${LIB_TYPE}) 35,60c35,60 < ${HDF5_TEST_SOURCE_DIR}/testhdf5.c < ${HDF5_TEST_SOURCE_DIR}/tarray.c < ${HDF5_TEST_SOURCE_DIR}/tattr.c < ${HDF5_TEST_SOURCE_DIR}/tchecksum.c < ${HDF5_TEST_SOURCE_DIR}/tconfig.c < ${HDF5_TEST_SOURCE_DIR}/tcoords.c < ${HDF5_TEST_SOURCE_DIR}/tfile.c < ${HDF5_TEST_SOURCE_DIR}/tgenprop.c < ${HDF5_TEST_SOURCE_DIR}/th5s.c < ${HDF5_TEST_SOURCE_DIR}/theap.c < ${HDF5_TEST_SOURCE_DIR}/titerate.c < ${HDF5_TEST_SOURCE_DIR}/tmeta.c < ${HDF5_TEST_SOURCE_DIR}/tmisc.c < ${HDF5_TEST_SOURCE_DIR}/trefer.c < ${HDF5_TEST_SOURCE_DIR}/trefstr.c < ${HDF5_TEST_SOURCE_DIR}/tselect.c < ${HDF5_TEST_SOURCE_DIR}/tskiplist.c < ${HDF5_TEST_SOURCE_DIR}/ttime.c < ${HDF5_TEST_SOURCE_DIR}/ttst.c < ${HDF5_TEST_SOURCE_DIR}/tunicode.c < ${HDF5_TEST_SOURCE_DIR}/tvltypes.c < ${HDF5_TEST_SOURCE_DIR}/tvlstr.c < ${HDF5_TEST_SOURCE_DIR}/th5o.c < ${HDF5_TEST_SOURCE_DIR}/tsohm.c < ${HDF5_TEST_SOURCE_DIR}/tid.c < ) --- > ${HDF5_TEST_SOURCE_DIR}/testhdf5.c > ${HDF5_TEST_SOURCE_DIR}/tarray.c > ${HDF5_TEST_SOURCE_DIR}/tattr.c > ${HDF5_TEST_SOURCE_DIR}/tchecksum.c > ${HDF5_TEST_SOURCE_DIR}/tconfig.c > ${HDF5_TEST_SOURCE_DIR}/tcoords.c > ${HDF5_TEST_SOURCE_DIR}/tfile.c > ${HDF5_TEST_SOURCE_DIR}/tgenprop.c > ${HDF5_TEST_SOURCE_DIR}/th5s.c > ${HDF5_TEST_SOURCE_DIR}/theap.c > ${HDF5_TEST_SOURCE_DIR}/titerate.c > ${HDF5_TEST_SOURCE_DIR}/tmeta.c > ${HDF5_TEST_SOURCE_DIR}/tmisc.c > ${HDF5_TEST_SOURCE_DIR}/trefer.c > ${HDF5_TEST_SOURCE_DIR}/trefstr.c > ${HDF5_TEST_SOURCE_DIR}/tselect.c > ${HDF5_TEST_SOURCE_DIR}/tskiplist.c > ${HDF5_TEST_SOURCE_DIR}/ttime.c > ${HDF5_TEST_SOURCE_DIR}/ttst.c > ${HDF5_TEST_SOURCE_DIR}/tunicode.c > ${HDF5_TEST_SOURCE_DIR}/tvltypes.c > ${HDF5_TEST_SOURCE_DIR}/tvlstr.c > ${HDF5_TEST_SOURCE_DIR}/th5o.c > ${HDF5_TEST_SOURCE_DIR}/tsohm.c > ${HDF5_TEST_SOURCE_DIR}/tid.c > ) 63,80c63,76 < ADD_EXECUTABLE (testhdf5 ${testhdf5_SRCS}) < H5_NAMING (testhdf5) < TARGET_LINK_LIBRARIES (testhdf5 ${HDF5_TEST_LIB_TARGET} ${HDF5_LIB_TARGET}) < < ADD_TEST (NAME testhdf5 COMMAND $) < < MACRO (ADD_H5_TEST file) < ADD_EXECUTABLE (${file} ${HDF5_TEST_SOURCE_DIR}/${file}.c) < H5_NAMING (${file}) < TARGET_LINK_LIBRARIES (${file} ${HDF5_TEST_LIB_TARGET} ${HDF5_LIB_TARGET}) < < ADD_TEST (NAME ${file} COMMAND $) < ENDMACRO (ADD_H5_TEST file) < < SET (H5_TESTS < app_ref < big < bittests --- > ADD_EXECUTABLE(testhdf5 ${testhdf5_SRCS}) > TARGET_LINK_LIBRARIES(testhdf5 ${HDF5_LIB_NAME} ${HDF5_TEST_LIB_NAME} ) > ADD_TEST(testhdf5 ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/testhdf5) > > macro (ADD_H5_TEST file) > ADD_EXECUTABLE(${file} ${HDF5_TEST_SOURCE_DIR}/${file}.c) > TARGET_LINK_LIBRARIES(${file} ${HDF5_LIB_NAME} ${HDF5_TEST_LIB_NAME} ) > ADD_TEST(${file} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${file}) > endmacro (ADD_H5_TEST file) > > set (H5_TESTS > app_ref > big > bittests 83,90c79,86 < # cache_api < cmpd_dset < cross_read < dangle < dsets < dt_arith < dtransform < dtypes --- > # cache_api > cmpd_dset > cross_read > dangle > dsets > dt_arith > dtransform > dtypes 95,116c91,112 < external < fheap < fillval < flush1 < flush2 < freespace < getname < gheap < hyperslab < istore < lheap < links < mf < mount < mtime < ntypes < objcopy < ohdr < pool < reserved < set_extent < stab --- > external > fheap > fillval > flush1 > flush2 > freespace > getname > gheap > hyperslab > istore > lheap > links > mf > mount > mtime > ntypes > objcopy > ohdr > pool > reserved > set_extent > stab 124,132c120,123 < FOREACH (test ${H5_TESTS}) < ADD_H5_TEST(${test}) < ENDFOREACH (test ${H5_TESTS}) < < #-- Allow extra time for fheap to complete 30min < IF (WIN32) < SET_TESTS_PROPERTIES (fheap PROPERTIES TIMEOUT 1800) < ENDIF (WIN32) < --- > foreach ( test ${H5_TESTS} ) > #message (STATUS "Adding test for ${test}") > ADD_H5_TEST( ${test} ) > endforeach ( test ${H5_TESTS} ) 135,145c126,132 < ADD_EXECUTABLE (cache ${HDF5_TEST_SOURCE_DIR}/cache.c ${HDF5_TEST_SOURCE_DIR}/cache_common.c) < H5_NAMING (cache) < TARGET_LINK_LIBRARIES (cache ${HDF5_LIB_TARGET} ${HDF5_TEST_LIB_TARGET}) < < ADD_TEST (NAME cache COMMAND $) < < ADD_EXECUTABLE (cache_api ${HDF5_TEST_SOURCE_DIR}/cache_api.c ${HDF5_TEST_SOURCE_DIR}/cache_common.c) < H5_NAMING (cache_api) < TARGET_LINK_LIBRARIES (cache_api ${HDF5_LIB_TARGET} ${HDF5_TEST_LIB_TARGET}) < < ADD_TEST (NAME cache_api COMMAND $) --- > ADD_EXECUTABLE(cache ${HDF5_TEST_SOURCE_DIR}/cache.c ${HDF5_TEST_SOURCE_DIR}/cache_common.c) > TARGET_LINK_LIBRARIES(cache ${HDF5_LIB_NAME} ${HDF5_TEST_LIB_NAME} ) > ADD_TEST(cache ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/cache) > > ADD_EXECUTABLE(cache_api ${HDF5_TEST_SOURCE_DIR}/cache_api.c ${HDF5_TEST_SOURCE_DIR}/cache_common.c) > TARGET_LINK_LIBRARIES(cache_api ${HDF5_LIB_NAME} ${HDF5_TEST_LIB_NAME} ) > ADD_TEST(cache_api ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/cache_api) 152,161c139,149 < FOREACH (h5_file ${HDF5_REFERENCE_TEST_FILES}) < SET (dest "${PROJECT_BINARY_DIR}/${h5_file}") < #MESSAGE (STATUS " Copying ${h5_file}") < ADD_CUSTOM_COMMAND ( < TARGET ${HDF5_TEST_LIB_TARGET} < POST_BUILD < COMMAND ${CMAKE_COMMAND} < ARGS -E copy_if_different ${HDF5_TOOLS_SOURCE_DIR}/testfiles/${h5_file} ${dest} < ) < ENDFOREACH (h5_file ${HDF5_REFERENCE_TEST_FILES}) --- > FOREACH ( h5_file ${HDF5_REFERENCE_TEST_FILES} ) > SET (dest "${PROJECT_BINARY_DIR}/${h5_file}") > #MESSAGE(STATUS " Copying ${h5_file}") > ADD_CUSTOM_COMMAND ( > TARGET ${HDF5_TEST_LIB_NAME} > POST_BUILD > COMMAND ${CMAKE_COMMAND} > ARGS -E copy_if_different ${HDF5_TOOLS_SOURCE_DIR}/testfiles/${h5_file} ${dest} > ) > > ENDFOREACH ( h5_file ${HDF5_REFERENCE_TEST_FILES} ) 166,205c154,197 < be_data.h5 < be_extlink1.h5 < be_extlink2.h5 < corrupt_stab_msg.h5 < deflate.h5 < family_v16_00000.h5 < family_v16_00001.h5 < family_v16_00002.h5 < family_v16_00003.h5 < fill_old.h5 < fixed_idx.h5 < group_old.h5 < le_data.h5 < le_extlink1.h5 < le_extlink2.h5 < mergemsg.h5 < noencoder.h5 < specmetaread.h5 < tarrold.h5 < tbad_msg_count.h5 < tbogus.h5 < test_filters_be.hdf5 < test_filters_le.hdf5 < th5s.h5 < tlayouto.h5 < tmtimen.h5 < tmtimeo.h5 < vms_data.h5 < ) < < FOREACH (h5_file ${HDF5_REFERENCE_TEST_FILES}) < SET (dest "${H5_TEST_BINARY_DIR}/${h5_file}") < #MESSAGE (STATUS " Copying ${h5_file} to ${dest}") < ADD_CUSTOM_COMMAND ( < TARGET ${HDF5_TEST_LIB_TARGET} < POST_BUILD < COMMAND ${CMAKE_COMMAND} < ARGS -E copy_if_different ${H5_TEST_SOURCE_DIR}/${h5_file} ${dest} < ) < ENDFOREACH (h5_file ${HDF5_REFERENCE_TEST_FILES}) --- > mergemsg.h5 > tbogus.h5 > tbad_msg_count.h5 > deflate.h5 > noencoder.h5 > > tmtimeo.h5 > tmtimen.h5 > fill_old.h5 > tlayouto.h5 > th5s.h5 > tarrold.h5 > group_old.h5 > corrupt_stab_msg.h5 > fixed_idx.h5 > le_extlink2.h5 > be_extlink2.h5 > > le_extlink1.h5 > be_extlink1.h5 > specmetaread.h5 > test_filters_le.hdf5 > test_filters_be.hdf5 > vms_data.h5 > le_data.h5 > be_data.h5 > > family_v16_00000.h5 > family_v16_00001.h5 > family_v16_00002.h5 > family_v16_00003.h5 > ) > > FOREACH ( h5_file ${HDF5_REFERENCE_TEST_FILES} ) > SET (dest "${H5_TEST_BINARY_DIR}/${h5_file}") > #MESSAGE(STATUS " Copying ${h5_file} to ${dest}") > ADD_CUSTOM_COMMAND ( > TARGET ${HDF5_TEST_LIB_NAME} > POST_BUILD > COMMAND ${CMAKE_COMMAND} > ARGS -E copy_if_different ${H5_TEST_SOURCE_DIR}/${h5_file} ${dest} > ) > > ENDFOREACH ( h5_file ${HDF5_REFERENCE_TEST_FILES} ) Only in Cmake-1.8.5-contrib/testpar: CMakeLists.txt diff -r Cmake-1.8.5-contrib/tools/CMakeLists.txt Cmake-initial-contrib/tools/CMakeLists.txt 1,2c1 < cmake_minimum_required (VERSION 2.8) < PROJECT (HDF5_TOOLS) --- > PROJECT (HDF5_Tools) 5c4 < # Setup include Directories --- > # Setup output Directories 7,8c6,19 < INCLUDE_DIRECTORIES (${HDF5_TOOLS_SOURCE_DIR}/lib) < INCLUDE_DIRECTORIES (${HDF5_PROJECT_DIR}/test) --- > IF(NOT HDF5_EXTERNALLY_CONFIGURED) > SET (CMAKE_LIBRARY_OUTPUT_DIRECTORY > ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all Libraries" > ) > SET (CMAKE_RUNTIME_OUTPUT_DIRECTORY > ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all Executables." > ) > SET (CMAKE_ARCHIVE_OUTPUT_DIRECTORY > ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all static libraries." > ) > ENDIF(NOT HDF5_EXTERNALLY_CONFIGURED) > > INCLUDE_DIRECTORIES(${HDF5_TOOLS_SOURCE_DIR}/lib) > INCLUDE_DIRECTORIES(${HDF5_PROJECT_DIR}/test) 13,15c24,26 < IF (NOT BUILD_TESTING) < ADD_SUBDIRECTORY (${HDF5_TOOLS_SOURCE_DIR}/lib) < ENDIF (NOT BUILD_TESTING) --- > if (NOT BUILD_TESTING) > add_subdirectory( ${HDF5_TOOLS_SOURCE_DIR}/lib ) > endif() 18,21c29,32 < ADD_SUBDIRECTORY (${HDF5_TOOLS_SOURCE_DIR}/h5diff) < < #-- Add the h5ls executable < ADD_SUBDIRECTORY (${HDF5_TOOLS_SOURCE_DIR}/h5ls) --- > ADD_EXECUTABLE(h5diff > ${HDF5_TOOLS_SOURCE_DIR}/h5diff/h5diff_common.c > ${HDF5_TOOLS_SOURCE_DIR}/h5diff/h5diff_main.c) > TARGET_LINK_LIBRARIES (h5diff ${HDF5_TOOLS_LIB_NAME} ${HDF5_LIB_NAME} ) 23,24c34,36 < #-- Misc Executables < ADD_SUBDIRECTORY (${HDF5_TOOLS_SOURCE_DIR}/misc) --- > #-- Add the h5dump and test executables > ADD_EXECUTABLE(h5dump ${HDF5_TOOLS_SOURCE_DIR}/h5dump/h5dump.c) > TARGET_LINK_LIBRARIES (h5dump ${HDF5_TOOLS_LIB_NAME} ${HDF5_LIB_NAME} ) 27,30c39,40 < ADD_SUBDIRECTORY (${HDF5_TOOLS_SOURCE_DIR}/h5import) < < #-- h5Repack executables < ADD_SUBDIRECTORY (${HDF5_TOOLS_SOURCE_DIR}/h5repack) --- > ADD_EXECUTABLE(h5import ${HDF5_TOOLS_SOURCE_DIR}/h5import/h5import.c) > TARGET_LINK_LIBRARIES (h5import ${HDF5_TOOLS_LIB_NAME} ${HDF5_LIB_NAME} ) 33c43,50 < ADD_SUBDIRECTORY (${HDF5_TOOLS_SOURCE_DIR}/h5jam) --- > ADD_EXECUTABLE(h5jam ${HDF5_TOOLS_SOURCE_DIR}/h5jam/h5jam.c) > TARGET_LINK_LIBRARIES (h5jam ${HDF5_TOOLS_LIB_NAME} ${HDF5_LIB_NAME} ) > ADD_EXECUTABLE(getub ${HDF5_TOOLS_SOURCE_DIR}/h5jam/getub.c) > TARGET_LINK_LIBRARIES (getub ${HDF5_TOOLS_LIB_NAME} ${HDF5_LIB_NAME} ) > ADD_EXECUTABLE(tellub ${HDF5_TOOLS_SOURCE_DIR}/h5jam/tellub.c) > TARGET_LINK_LIBRARIES (tellub ${HDF5_TOOLS_LIB_NAME} ${HDF5_LIB_NAME} ) > ADD_EXECUTABLE(h5unjam ${HDF5_TOOLS_SOURCE_DIR}/h5jam/h5unjam.c) > TARGET_LINK_LIBRARIES (h5unjam ${HDF5_TOOLS_LIB_NAME} ${HDF5_LIB_NAME} ) 35,36c52,54 < #-- Add the h5copy and test executables < ADD_SUBDIRECTORY (${HDF5_TOOLS_SOURCE_DIR}/h5copy) --- > #-- Add the h5ls executable > ADD_EXECUTABLE(h5ls ${HDF5_TOOLS_SOURCE_DIR}/h5ls/h5ls.c) > TARGET_LINK_LIBRARIES (h5ls ${HDF5_TOOLS_LIB_NAME} ${HDF5_LIB_NAME} ) 38,39d55 < #-- Add the h5stat and test executables < ADD_SUBDIRECTORY (${HDF5_TOOLS_SOURCE_DIR}/h5stat) 41,42c57,138 < #-- Add the h5dump and test executables < ADD_SUBDIRECTORY (${HDF5_TOOLS_SOURCE_DIR}/h5dump) --- > #-- Misc Executables > ADD_EXECUTABLE(h5debug ${HDF5_TOOLS_SOURCE_DIR}/misc/h5debug.c) > TARGET_LINK_LIBRARIES (h5debug ${HDF5_LIB_NAME} ${HDF5_TOOLS_LIB_NAME} ) > ADD_EXECUTABLE(h5repart ${HDF5_TOOLS_SOURCE_DIR}/misc/h5repart.c) > TARGET_LINK_LIBRARIES (h5repart ${HDF5_LIB_NAME} ${HDF5_TOOLS_LIB_NAME} ) > > #-- h5Repack executables > SET (REPACK_COMMON_SRCS > ${HDF5_TOOLS_SOURCE_DIR}/h5repack/h5repack_copy.c > ${HDF5_TOOLS_SOURCE_DIR}/h5repack/h5repack_filters.c > # ${HDF5_TOOLS_SOURCE_DIR}/h5repack/h5repack_list.c > ${HDF5_TOOLS_SOURCE_DIR}/h5repack/h5repack_opttable.c > ${HDF5_TOOLS_SOURCE_DIR}/h5repack/h5repack_parse.c > ${HDF5_TOOLS_SOURCE_DIR}/h5repack/h5repack_refs.c > ${HDF5_TOOLS_SOURCE_DIR}/h5repack/h5repack_verify.c > ${HDF5_TOOLS_SOURCE_DIR}/h5repack/h5repack.c > ) > include_directories(${HDF5_TEST_SOURCE_DIR}) > ADD_EXECUTABLE(h5repack ${REPACK_COMMON_SRCS} ${HDF5_TOOLS_SOURCE_DIR}/h5repack/h5repack_main.c) > TARGET_LINK_LIBRARIES (h5repack ${HDF5_TOOLS_LIB_NAME} ${HDF5_LIB_NAME} ) > > SET (H5_DEP_EXECUTABLES > h5diff > h5dump > h5import > h5jam > getub > tellub > h5unjam > h5ls > h5debug > h5repart > h5repack > ) > > > IF (BUILD_TESTING) > > ADD_EXECUTABLE(h5diffgentest ${HDF5_TOOLS_SOURCE_DIR}/h5diff/h5diffgentest.c) > TARGET_LINK_LIBRARIES (h5diffgentest ${HDF5_LIB_NAME} ${HDF5_TOOLS_LIB_NAME} ) > #ADD_TEST(h5diffgentest ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/h5diffgentest) > > ADD_EXECUTABLE(h5dumpgentest ${HDF5_TOOLS_SOURCE_DIR}/h5dump/h5dumpgentest.c) > TARGET_LINK_LIBRARIES (h5dumpgentest ${HDF5_LIB_NAME} ${HDF5_TOOLS_LIB_NAME} ) > #ADD_TEST(h5dumpgentest ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/h5dumpgentest) > > ADD_EXECUTABLE(h5jamgentest ${HDF5_TOOLS_SOURCE_DIR}/h5jam/h5jamgentest.c) > TARGET_LINK_LIBRARIES (h5jamgentest ${HDF5_LIB_NAME} ${HDF5_TOOLS_LIB_NAME} ) > #ADD_TEST(h5jamgentest ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/h5jamgentest) > > ADD_EXECUTABLE(h5importtest ${HDF5_TOOLS_SOURCE_DIR}/h5import/h5importtest.c) > TARGET_LINK_LIBRARIES (h5importtest ${HDF5_LIB_NAME} ${HDF5_TOOLS_LIB_NAME} ) > ADD_TEST(h5importtest ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/h5importtest) > > ADD_EXECUTABLE(h5repacktest ${REPACK_COMMON_SRCS} ${HDF5_TOOLS_SOURCE_DIR}/h5repack/h5repacktst.c ) > TARGET_LINK_LIBRARIES (h5repacktest ${HDF5_TOOLS_LIB_NAME} ${HDF5_TEST_LIB_NAME}) > ADD_TEST(h5repacktest ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/h5repacktest) > > ADD_EXECUTABLE(testh5repack_detect_szip ${HDF5_TOOLS_SOURCE_DIR}/h5repack/testh5repack_detect_szip.c) > TARGET_LINK_LIBRARIES (testh5repack_detect_szip ${HDF5_LIB_NAME} ${HDF5_TOOLS_LIB_NAME} ) > ADD_TEST(testh5repack_detect_szip ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/testh5repack_detect_szip) > > SET (H5_DEP_EXECUTABLES ${H5_DEP_EXECUTABLES} > # h5diffgentest > binread > # h5dumpgentest > # h5jamgentest > h5importtest > h5repacktest > testh5repack_detect_szip > ) > > ENDIF (BUILD_TESTING) > > #--- Set up the installation Code for Make Install > INSTALL( > TARGETS > h5debug h5diff h5dump h5import > h5ls h5repack h5repart > h5jam h5unjam > RUNTIME DESTINATION bin > ) \ No newline at end of file Only in Cmake-1.8.5-contrib/tools/h5copy: CMakeLists.txt Only in Cmake-1.8.5-contrib/tools/h5diff: CMakeLists.txt Only in Cmake-1.8.5-contrib/tools/h5dump: CMakeLists.txt Only in Cmake-1.8.5-contrib/tools/h5import: CMakeLists.txt Only in Cmake-1.8.5-contrib/tools/h5jam: CMakeLists.txt Only in Cmake-1.8.5-contrib/tools/h5ls: CMakeLists.txt Only in Cmake-1.8.5-contrib/tools/h5repack: CMakeLists.txt Only in Cmake-1.8.5-contrib/tools/h5stat: CMakeLists.txt diff -r Cmake-1.8.5-contrib/tools/lib/CMakeLists.txt Cmake-initial-contrib/tools/lib/CMakeLists.txt 1,2c1 < cmake_minimum_required (VERSION 2.8) < PROJECT (HDF5_TOOLS_LIB) --- > PROJECT (HDF5_Tools_Lib) 5c4 < # Define Sources --- > # Setup output Directories 7,8c6,16 < #INCLUDE_DIRECTORIES (${HDF5_TOOLS_SOURCE_DIR}/lib) < #INCLUDE_DIRECTORIES (${HDF5_PROJECT_DIR}/test) --- > IF(NOT HDF5_EXTERNALLY_CONFIGURED) > SET (CMAKE_RUNTIME_OUTPUT_DIRECTORY > ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all Executables." > ) > SET (CMAKE_LIBRARY_OUTPUT_DIRECTORY > ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all Libraries" > ) > SET (CMAKE_ARCHIVE_OUTPUT_DIRECTORY > ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all static libraries." > ) > ENDIF(NOT HDF5_EXTERNALLY_CONFIGURED) 10,23c18,19 < SET (H5_TOOLS_LIB_SRCS < ${HDF5_TOOLS_SOURCE_DIR}/lib/h5diff.c < ${HDF5_TOOLS_SOURCE_DIR}/lib/h5diff_array.c < ${HDF5_TOOLS_SOURCE_DIR}/lib/h5diff_attr.c < ${HDF5_TOOLS_SOURCE_DIR}/lib/h5diff_dset.c < ${HDF5_TOOLS_SOURCE_DIR}/lib/h5diff_util.c < ${HDF5_TOOLS_SOURCE_DIR}/lib/h5tools.c < ${HDF5_TOOLS_SOURCE_DIR}/lib/h5tools_filters.c < ${HDF5_TOOLS_SOURCE_DIR}/lib/h5tools_ref.c < ${HDF5_TOOLS_SOURCE_DIR}/lib/h5tools_str.c < ${HDF5_TOOLS_SOURCE_DIR}/lib/h5tools_type.c < ${HDF5_TOOLS_SOURCE_DIR}/lib/h5tools_utils.c < ${HDF5_TOOLS_SOURCE_DIR}/lib/h5trav.c < ) --- > #INCLUDE_DIRECTORIES(${HDF5_TOOLS_SOURCE_DIR}/lib) > #INCLUDE_DIRECTORIES(${HDF5_PROJECT_DIR}/test) 24a21,35 > SET (H5_TOOLS_LIB_SRCS > ${HDF5_TOOLS_SOURCE_DIR}/lib/h5diff.c > ${HDF5_TOOLS_SOURCE_DIR}/lib/h5diff_array.c > ${HDF5_TOOLS_SOURCE_DIR}/lib/h5diff_attr.c > ${HDF5_TOOLS_SOURCE_DIR}/lib/h5diff_dset.c > ${HDF5_TOOLS_SOURCE_DIR}/lib/h5diff_util.c > ${HDF5_TOOLS_SOURCE_DIR}/lib/h5tools.c > ${HDF5_TOOLS_SOURCE_DIR}/lib/h5tools_filters.c > ${HDF5_TOOLS_SOURCE_DIR}/lib/h5tools_ref.c > ${HDF5_TOOLS_SOURCE_DIR}/lib/h5tools_str.c > ${HDF5_TOOLS_SOURCE_DIR}/lib/h5tools_type.c > ${HDF5_TOOLS_SOURCE_DIR}/lib/h5tools_utils.c > ${HDF5_TOOLS_SOURCE_DIR}/lib/h5trav.c > ) > 26,31c37,42 < ${HDF5_TOOLS_SOURCE_DIR}/lib/h5trav.h < ${HDF5_TOOLS_SOURCE_DIR}/lib/h5tools.h < ${HDF5_TOOLS_SOURCE_DIR}/lib/h5tools_utils.h < ${HDF5_TOOLS_SOURCE_DIR}/lib/h5tools_str.h < ${HDF5_TOOLS_SOURCE_DIR}/lib/h5tools_ref.h < ${HDF5_TOOLS_SOURCE_DIR}/lib/h5diff.h --- > ${HDF5_TOOLS_SOURCE_DIR}/lib/h5trav.h > ${HDF5_TOOLS_SOURCE_DIR}/lib/h5tools.h > ${HDF5_TOOLS_SOURCE_DIR}/lib/h5tools_utils.h > ${HDF5_TOOLS_SOURCE_DIR}/lib/h5tools_str.h > ${HDF5_TOOLS_SOURCE_DIR}/lib/h5tools_ref.h > ${HDF5_TOOLS_SOURCE_DIR}/lib/h5diff.h 33a45 > 35,42c47,52 < ADD_LIBRARY (${HDF5_TOOLS_LIB_TARGET} ${LIB_TYPE} ${H5_TOOLS_LIB_SRCS} ${H5_TOOLS_LIB_HDRS}) < TARGET_LINK_LIBRARIES (${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET}) < SET_GLOBAL_VARIABLE( HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_TOOLS_LIB_TARGET}") < H5_SET_LIB_OPTIONS ( < ${HDF5_TOOLS_LIB_TARGET} ${HDF5_TOOLS_LIB_NAME} < ${LIB_TYPE} < HDF5_TOOLS_LIB_NAME_RELEASE < HDF5_TOOLS_LIB_NAME_DEBUG --- > ADD_LIBRARY( ${HDF5_TOOLS_LIB_NAME} STATIC ${H5_TOOLS_LIB_SRCS} ${H5_TOOLS_LIB_HDRS}) > SET_GLOBAL_VARIABLE(HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_TOOLS_LIB_NAME}") > H5_SET_LIB_OPTIONS( > ${HDF5_TOOLS_LIB_NAME} ${HDF5_TOOLS_LIB_NAME} > STATIC > HDF5_TOOLS_LIB_NAME_RELEASE HDF5_TOOLS_LIB_NAME_DEBUG 45,53d54 < #----------------------------------------------------------------------------- < # Add file(s) to CMake Install < #----------------------------------------------------------------------------- < INSTALL ( < FILES < ${H5_TOOLS_LIB_HDRS} < DESTINATION < include/tools < ) 55,68d55 < #----------------------------------------------------------------------------- < # Add Target(s) to CMake Install for import into other projects < #----------------------------------------------------------------------------- < IF (HDF5_EXPORTED_TARGETS) < INSTALL ( < TARGETS < ${HDF5_TOOLS_LIB_TARGET} < EXPORT < ${HDF5_EXPORTED_TARGETS} < LIBRARY DESTINATION lib/tools < ARCHIVE DESTINATION lib/tools < RUNTIME DESTINATION bin/tools < ) < ENDIF (HDF5_EXPORTED_TARGETS) Only in Cmake-1.8.5-contrib/tools/misc: CMakeLists.txt