From 5422acf9b2e3b65a19949be2ef166590f9d471ae Mon Sep 17 00:00:00 2001 From: Dana Robinson Date: Sat, 26 Sep 2015 23:56:13 -0500 Subject: [svn-r27892] Removed redefinition of H5C__HASH_FCN in test/cache_common.h. This was causing failures on Ada. Tested on: Ubuntu 15.04 (Linux 3.19.0) w/ gcc 4.9.3 --- test/cache_common.h | 1 - 1 file changed, 1 deletion(-) diff --git a/test/cache_common.h b/test/cache_common.h index 9e8c5ba..c07ab25 100644 --- a/test/cache_common.h +++ b/test/cache_common.h @@ -360,7 +360,6 @@ typedef struct test_entry_t */ #define H5C__HASH_MASK ((size_t)(H5C__HASH_TABLE_LEN - 1) << 3) -#define H5C__HASH_FCN(x) (int)(((x) & H5C__HASH_MASK) >> 3) #define H5C_TEST__PRE_HT_SEARCH_SC(cache_ptr, Addr) \ if ( ( (cache_ptr) == NULL ) || \ -- cgit v0.12 From 68962cb2fa9ce37dde2138524506938022dc1bb8 Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Mon, 28 Sep 2015 08:21:25 -0500 Subject: [svn-r27894] All generated headers need to be packaged. --- src/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e16a873..17dc633 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -949,7 +949,7 @@ if (NOT HDF5_INSTALL_NO_DEVELOPMENT) install ( FILES ${H5_PUBLIC_HEADERS} - ${H5_PUBLIC_GENERATED_HEADERS} + ${H5_GENERATED_HEADERS} DESTINATION ${HDF5_INSTALL_INCLUDE_DIR} COMPONENT -- cgit v0.12 From ccd6248532a7b1030fcfa571607a7cd16228b354 Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Mon, 28 Sep 2015 12:30:48 -0500 Subject: [svn-r27895] Rework the generated file dependencies and commands. --- config/cmake/HDF5_Process_Flex_Files.cmake | 6 ++++++ hl/src/CMakeLists.txt | 6 +----- src/CMakeLists.txt | 9 ++------- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/config/cmake/HDF5_Process_Flex_Files.cmake b/config/cmake/HDF5_Process_Flex_Files.cmake index da1a842..2904d2a 100644 --- a/config/cmake/HDF5_Process_Flex_Files.cmake +++ b/config/cmake/HDF5_Process_Flex_Files.cmake @@ -46,6 +46,9 @@ if (FILE_PARSE) ") file (APPEND ${FILE_PARSE} "${TEST_STREAM}") message (STATUS "processing pragma in ${FILE_PARSE}") + EXECUTE_PROCESS ( + COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/${FILE_PARSE}.timestamp + ) endif (FILE_PARSE) if (FILE_ANALYZE) @@ -78,4 +81,7 @@ if (FILE_ANALYZE) ") file (APPEND ${FILE_ANALYZE} "${TEST_STREAM}") message (STATUS "processing pragma in ${FILE_ANALYZE}") + EXECUTE_PROCESS ( + COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/${FILE_ANALYZE}.timestamp + ) endif (FILE_ANALYZE) diff --git a/hl/src/CMakeLists.txt b/hl/src/CMakeLists.txt index 25f3cb5..1778ae0 100644 --- a/hl/src/CMakeLists.txt +++ b/hl/src/CMakeLists.txt @@ -32,8 +32,6 @@ if (HDF5_GENERATE_HEADERS) COMMAND "${CMAKE_COMMAND}" -D "FILE_PARSE=H5LTparse.c" -P "${HDF_RESOURCES_DIR}/HDF5_Process_Flex_Files.cmake" - COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/H5LTparse.timestamp - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/H5LTparse.c WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} ) add_custom_command ( @@ -41,11 +39,9 @@ if (HDF5_GENERATE_HEADERS) COMMAND "${CMAKE_COMMAND}" -D "FILE_ANALYZE=H5LTanalyze.c" -P "${HDF_RESOURCES_DIR}/HDF5_Process_Flex_Files.cmake" - COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/H5LTanalyze.timestamp - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/H5LTanalyze.c WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} ) - add_custom_target (process_gen_H5LT DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/H5LTparse.timestamp ${CMAKE_CURRENT_BINARY_DIR}/H5LTanalyze.timestamp) + add_custom_target (process_gen_H5LT DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/H5LTparse.c.timestamp ${CMAKE_CURRENT_BINARY_DIR}/H5LTanalyze.c.timestamp) # add_custom_target (process_gen_H5LT # COMMAND "${CMAKE_COMMAND}" diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 17dc633..f9b4a74 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -819,11 +819,6 @@ if (HDF5_GENERATE_HEADERS) endif (PERL_FOUND) endif (HDF5_GENERATE_HEADERS) -set (H5_PUBLIC_GENERATED_HEADERS - ${HDF5_SRC_DIR}/H5version.h - ${HDF5_SRC_DIR}/H5overflow.h -) - #----------------------------------------------------------------------------- # Setup the H5Detect utility which generates H5Tinit with platform # specific type checks inside @@ -836,7 +831,7 @@ endif (MSVC OR MINGW) if (HDF5_GENERATE_HEADERS) add_dependencies(H5detect generate_precompiled) else (HDF5_GENERATE_HEADERS) - add_dependencies(H5detect "${H5_PUBLIC_GENERATED_HEADERS}") + add_dependencies(H5detect "${H5_GENERATED_HEADERS}") endif (HDF5_GENERATE_HEADERS) set (CMD $) @@ -855,7 +850,7 @@ endif (MSVC OR MINGW) if (HDF5_GENERATE_HEADERS) add_dependencies(H5detect generate_precompiled) else (HDF5_GENERATE_HEADERS) - add_dependencies(H5make_libsettings "${H5_PUBLIC_GENERATED_HEADERS}") + add_dependencies(H5make_libsettings "${H5_GENERATED_HEADERS}") endif (HDF5_GENERATE_HEADERS) set (CMD $) -- cgit v0.12 From 627255539436e8a6c00fada089e95821c4109189 Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Mon, 28 Sep 2015 12:47:19 -0500 Subject: [svn-r27896] Synch VFD types with autotools --- test/CMakeTests.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/test/CMakeTests.cmake b/test/CMakeTests.cmake index 4d3d88b..08beaa7 100644 --- a/test/CMakeTests.cmake +++ b/test/CMakeTests.cmake @@ -20,6 +20,7 @@ if (HDF5_TEST_VFD) sec2 stdio core + core_paged split multi family -- cgit v0.12 From e688c682c3120bd1f3c2a6e3bb91fd47d1551ffe Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Mon, 28 Sep 2015 12:48:02 -0500 Subject: [svn-r27897] Reduce normal test timeouts to 10 mins - leave VFD changes as is. --- CTestConfig.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CTestConfig.cmake b/CTestConfig.cmake index 7497b08..36bf4a0 100644 --- a/CTestConfig.cmake +++ b/CTestConfig.cmake @@ -23,9 +23,9 @@ set (VALGRIND_COMMAND_OPTIONS "-v --tool=memcheck --leak-check=full --track-fds= set (CTEST_MEMORYCHECK_COMMAND "/usr/bin/valgrind") set (CTEST_MEMORYCHECK_COMMAND_OPTIONS "-v --tool=memcheck --leak-check=full --track-fds=yes --num-callers=50 --show-reachable=yes --track-origins=yes --malloc-fill=0xff --free-fill=0xfe") -set (CTEST_TEST_TIMEOUT 1200 CACHE STRING - "Maximum time allowed before CTest will kill the test.") -set (DART_TESTING_TIMEOUT 1200 CACHE STRING +set (CTEST_TEST_TIMEOUT 600 CACHE STRING + "Maximum time allowed before CTest will kill the test.") +set (DART_TESTING_TIMEOUT 600 CACHE STRING "Maximum time allowed before CTest will kill the test." FORCE) SET(CTEST_SUBMIT_RETRY_DELAY 20 CACHE STRING -- cgit v0.12 From e1882686106eca76e5c37ee721afb5606077c844 Mon Sep 17 00:00:00 2001 From: Mohamad Chaarawi Date: Mon, 28 Sep 2015 13:17:08 -0500 Subject: [svn-r27898] add an additional perl command to replace int with hid_t in H5LTparse.c - this is needed when running autogen on a couple of HPC machines. --- autogen.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/autogen.sh b/autogen.sh index d76c016..0d7ba05 100755 --- a/autogen.sh +++ b/autogen.sh @@ -426,6 +426,7 @@ ${HDF5_FLEX} --nounistd -PH5LTyy -o H5LTanalyze.c H5LTanalyze.l # I propose to not use flex to generate this function, but for now I am # adding a perl command to find and replace this function declaration in # H5LTparse.c. +perl -0777 -pi -e 's/int yyparse/hid_t yyparse/igs' H5LTparse.c perl -0777 -pi -e 's/int\nyyparse/hid_t\nyyparse/igs' H5LTparse.c perl -0777 -pi -e 's/int H5LTyyparse/hid_t H5LTyyparse/igs' H5LTparse.c -- cgit v0.12 From a4e6d0c7e199558b3c9f839a4ccb8071e48c7495 Mon Sep 17 00:00:00 2001 From: Larry Knox Date: Mon, 28 Sep 2015 13:32:42 -0500 Subject: [svn-r27900] Modify bbrelease to use "Revision:" number from svn info, not "Last Changed Rev:" number. Tested on jam --- bin/bbrelease | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/bbrelease b/bin/bbrelease index 1f6e479..119dc7a 100755 --- a/bin/bbrelease +++ b/bin/bbrelease @@ -269,7 +269,7 @@ if [ X$revmode = Xyes ]; then # "undo" changes to it. cp config/lt_vers.am $tmpdir branch=`svn info | grep ^URL: | awk -F/ '{print $NF}'` - revision=`svn info | grep "Last Changed Rev:" | awk '{print $4}'` + revision=`svn info | grep "Revision:" | awk '{print $2}'` # Set version information to m.n.r-r$revision. # (h5vers does not correctly handle just m.n.r-$today.) VERS=`echo $VERS | sed -e s/-.*//`-r$revision -- cgit v0.12 From 510936d9157e9385abe379a73387a8221a1e2eed Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Mon, 28 Sep 2015 13:39:43 -0500 Subject: [svn-r27901] Rework doc for updated examples script --- release_docs/USING_HDF5_CMake.txt | 189 +++++++++++++++++++++++++++++++------- 1 file changed, 154 insertions(+), 35 deletions(-) diff --git a/release_docs/USING_HDF5_CMake.txt b/release_docs/USING_HDF5_CMake.txt index 5fdb76c..578f957 100644 --- a/release_docs/USING_HDF5_CMake.txt +++ b/release_docs/USING_HDF5_CMake.txt @@ -225,46 +225,165 @@ NOTE: these files are available at the HDF web site: ======================================================================== ctest ======================================================================== +cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR) ############################################################################ # Product specific script, HDF518_Examples.cmake, that uses the # CTestScript.cmake file (see Appendix in the CMake.txt). Usage: -# "ctest -S HDF518_Examples.cmake,HDF5Examples-0.1.1-Source -C Release -O test.log" -# where HDF5Examples-0.1.1-Source is the source folder relative to the location of these scripts -############################################################################ - -cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR) - +# ctest -S HDF518_Examples.cmake,OPTION=VALUE -C Release -VV -O test.log +# where valid options for OPTION are: +# INSTALLDIR - root folder where hdf5 is installed +# CTEST_BUILD_CONFIGURATION - Release, Debug, etc +# CTEST_SOURCE_NAME - source folder +# STATICLIBRARIES - Build/use static libraries +# NO_MAC_FORTRAN - Yes to be SHARED on a Mac +############################################################################################################### + +set(CTEST_CMAKE_GENERATOR "@CMAKE_GENERATOR@") set(CTEST_DASHBOARD_ROOT ${CTEST_SCRIPT_DIRECTORY}) -set(CTEST_SOURCE_NAME ${CTEST_SCRIPT_ARG}) -set(CTEST_BINARY_NAME ${CTEST_SOURCE_NAME}/build) -set(CTEST_SOURCE_DIRECTORY "${CTEST_DASHBOARD_ROOT}/${CTEST_SOURCE_NAME}") -set(CTEST_BINARY_DIRECTORY "${CTEST_DASHBOARD_ROOT}/${CTEST_BINARY_NAME}") -set(CTEST_BUILD_CONFIGURATION "Release") -set(MODEL "Experimental") - -# build generator name, see cmake generator list -set(CTEST_CMAKE_GENERATOR "Unix Makefiles") - -# machine description, can be removed on linux -set(CTEST_SITE "machine.domain") -set(SITE_OS_NAME "os name") -set(SITE_OS_VERSION "os version") -set(SITE_OS_BITS "os size") -set(SITE_COMPILER_NAME "compiler name") -set(SITE_COMPILER_VERSION "compiler version") - -# needed for source updates, change as required -set(REPOSITORY_URL "http://svn.${hdfgroup_url}/hdf5-examples/trunk/1_8") - -set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_INSTALL_PREFIX:PATH=/usr/local/hdf5Examples-1.8") - -# location of the installed hdf5 (cmake configuration folder) -set(ENV{HDF5_DIR} "/usr/share/cmake") - -include(${CTEST_SCRIPT_DIRECTORY}/CTestScript.cmake) - -message("DONE") +#set(BUILD_OPTIONS "${BUILD_OPTIONS} -DHDF_BUILD_FORTRAN:BOOL=ON") + +# handle input parameters to script. +#INSTALLDIR - HDF5-1.8 root folder +#CTEST_BUILD_CONFIGURATION - Release, Debug, RelWithDebInfo +#CTEST_SOURCE_NAME - name of source folder; HDF4Examples +#STATICLIBRARIES - Default is YES +#NO_MAC_FORTRAN - set to TRUE to allow shared libs on a Mac +if(DEFINED CTEST_SCRIPT_ARG) + # transform ctest script arguments of the form + # script.ctest,var1=value1,var2=value2 + # to variables with the respective names set to the respective values + string(REPLACE "," ";" script_args "${CTEST_SCRIPT_ARG}") + foreach(current_var ${script_args}) + if ("${current_var}" MATCHES "^([^=]+)=(.+)$") + set("${CMAKE_MATCH_1}" "${CMAKE_MATCH_2}") + endif() + endforeach() +endif() +if(NOT DEFINED INSTALLDIR) + set(INSTALLDIR "/usr/local/myhdf5") +endif() +if(NOT DEFINED CTEST_BUILD_CONFIGURATION) + set(CTEST_BUILD_CONFIGURATION "Release") +endif() +if(NOT DEFINED CTEST_SOURCE_NAME) + set(CTEST_SOURCE_NAME "HDF5Examples") +endif() +if(NOT DEFINED STATICLIBRARIES) + set(STATICLIBRARIES "YES") +endif() + +#TAR_SOURCE - name of tarfile +#if(NOT DEFINED TAR_SOURCE) +# set(CTEST_USE_TAR_SOURCE "HDF5Examples-1.2.1-Source") +#endif() + +############################################################################################################### +# Adjust the following SET Commands as needed +############################################################################################################### +if(WIN32) + if(STATICLIBRARIES) + set(BUILD_OPTIONS "${BUILD_OPTIONS} -DBUILD_SHARED_LIBS:BOOL=OFF") + endif(STATICLIBRARIES) + set(ENV{HDF5_DIR} "${INSTALLDIR}/cmake") + set(CTEST_BINARY_NAME ${CTEST_SOURCE_NAME}\\build) + set(CTEST_SOURCE_DIRECTORY "${CTEST_DASHBOARD_ROOT}\\${CTEST_SOURCE_NAME}") + set(CTEST_BINARY_DIRECTORY "${CTEST_DASHBOARD_ROOT}\\${CTEST_BINARY_NAME}") +else(WIN32) + if(STATICLIBRARIES) + set(BUILD_OPTIONS "${BUILD_OPTIONS} -DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_ANSI_CFLAGS:STRING=-fPIC") + endif(STATICLIBRARIES) + set(ENV{HDF5_DIR} "${INSTALLDIR}/share/cmake") + set(ENV{LD_LIBRARY_PATH} "${INSTALLDIR}/lib") + set(CTEST_BINARY_NAME ${CTEST_SOURCE_NAME}/build) + set(CTEST_SOURCE_DIRECTORY "${CTEST_DASHBOARD_ROOT}/${CTEST_SOURCE_NAME}") + set(CTEST_BINARY_DIRECTORY "${CTEST_DASHBOARD_ROOT}/${CTEST_BINARY_NAME}") +endif(WIN32) + +############################################################################################################### +# For any comments please contact cdashhelp@hdfgroup.org +# +############################################################################################################### + +#----------------------------------------------------------------------------- +# MAC machines need special option +#----------------------------------------------------------------------------- +if(APPLE) + # Compiler choice + execute_process(COMMAND xcrun --find cc OUTPUT_VARIABLE XCODE_CC OUTPUT_STRIP_TRAILING_WHITESPACE) + execute_process(COMMAND xcrun --find c++ OUTPUT_VARIABLE XCODE_CXX OUTPUT_STRIP_TRAILING_WHITESPACE) + set(ENV{CC} "${XCODE_CC}") + set(ENV{CXX} "${XCODE_CXX}") + if(NOT NO_MAC_FORTRAN) + # Shared fortran is not supported, build static + set(BUILD_OPTIONS "${BUILD_OPTIONS} -DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_ANSI_CFLAGS:STRING=-fPIC") + else(NOT NO_MAC_FORTRAN) + set(BUILD_OPTIONS "${BUILD_OPTIONS} -DHDF_BUILD_FORTRAN:BOOL=OFF") + endif(NOT NO_MAC_FORTRAN) + set(BUILD_OPTIONS "${BUILD_OPTIONS} -DCTEST_USE_LAUNCHERS:BOOL=ON -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=OFF") +endif(APPLE) + +#----------------------------------------------------------------------------- +set(CTEST_CMAKE_COMMAND "\"${CMAKE_COMMAND}\"") +## -------------------------- +if(CTEST_USE_TAR_SOURCE) + ## Uncompress source if tar or zip file provided + ## -------------------------- + if(WIN32) + message(STATUS "extracting... [${CMAKE_EXECUTABLE_NAME} -E tar -xvf ${CTEST_USE_TAR_SOURCE}.zip]") + execute_process(COMMAND ${CMAKE_EXECUTABLE_NAME} -E tar -xvf ${CTEST_DASHBOARD_ROOT}\\${CTEST_USE_TAR_SOURCE}.zip RESULT_VARIABLE rv) + else() + message(STATUS "extracting... [${CMAKE_EXECUTABLE_NAME} -E tar -xvf ${CTEST_USE_TAR_SOURCE}.tar]") + execute_process(COMMAND ${CMAKE_EXECUTABLE_NAME} -E tar -xvf ${CTEST_DASHBOARD_ROOT}/${CTEST_USE_TAR_SOURCE}.tar RESULT_VARIABLE rv) + endif() + + if(NOT rv EQUAL 0) + message(STATUS "extracting... [error-(${rv}) clean up]") + file(REMOVE_RECURSE "${CTEST_SOURCE_DIRECTORY}") + message(FATAL_ERROR "error: extract of ${CTEST_SOURCE_NAME} failed") + endif(NOT rv EQUAL 0) +endif(CTEST_USE_TAR_SOURCE) + +#----------------------------------------------------------------------------- +## Clear the build directory +## -------------------------- +set(CTEST_START_WITH_EMPTY_BINARY_DIRECTORY TRUE) +if (EXISTS "${CTEST_BINARY_DIRECTORY}" AND IS_DIRECTORY "${CTEST_BINARY_DIRECTORY}") + ctest_empty_binary_directory(${CTEST_BINARY_DIRECTORY}) +else (EXISTS "${CTEST_BINARY_DIRECTORY}" AND IS_DIRECTORY "${CTEST_BINARY_DIRECTORY}") + file(MAKE_DIRECTORY "${CTEST_BINARY_DIRECTORY}") +endif (EXISTS "${CTEST_BINARY_DIRECTORY}" AND IS_DIRECTORY "${CTEST_BINARY_DIRECTORY}") + +# Use multiple CPU cores to build +include(ProcessorCount) +ProcessorCount(N) +if(NOT N EQUAL 0) + if(NOT WIN32) + set(CTEST_BUILD_FLAGS -j${N}) + endif(NOT WIN32) + set(ctest_test_args ${ctest_test_args} PARALLEL_LEVEL ${N}) +endif() +set (CTEST_CONFIGURE_COMMAND + "${CTEST_CMAKE_COMMAND} -C \"${CTEST_SOURCE_DIRECTORY}/config/cmake/cacheinit.cmake\" -DCMAKE_BUILD_TYPE:STRING=${CTEST_BUILD_CONFIGURATION} ${BUILD_OPTIONS} \"-G${CTEST_CMAKE_GENERATOR}\" \"${CTEST_SOURCE_DIRECTORY}\"" +) + +#----------------------------------------------------------------------------- +## -- set output to english +set($ENV{LC_MESSAGES} "en_EN") + +#----------------------------------------------------------------------------- +configure_file(${CTEST_SOURCE_DIRECTORY}/config/cmake/CTestCustom.cmake ${CTEST_BINARY_DIRECTORY}/CTestCustom.cmake) +ctest_read_custom_files ("${CTEST_BINARY_DIRECTORY}") +## NORMAL process +## -------------------------- +ctest_start (Experimental) +ctest_configure (BUILD "${CTEST_BINARY_DIRECTORY}") +ctest_build (BUILD "${CTEST_BINARY_DIRECTORY}" APPEND) +ctest_test (BUILD "${CTEST_BINARY_DIRECTORY}" APPEND ${ctest_test_args} RETURN_VALUE res) +if(res GREATER 0) + message (FATAL_ERROR "tests FAILED") +endif(res GREATER 0) +#----------------------------------------------------------------------------- ################################################################################# -- cgit v0.12 From 11201a24ef32d82423ac952b71f16ecfbeec9b5a Mon Sep 17 00:00:00 2001 From: Dana Robinson Date: Mon, 28 Sep 2015 14:04:04 -0500 Subject: [svn-r27902] Updated autogen.sh to use /usr/hdf/bin/AUTOTOOLS paths and removed hard-coded version checks. Tested on: jam --- autogen.sh | 88 ++++++++++---------------------------------------------------- 1 file changed, 14 insertions(+), 74 deletions(-) diff --git a/autogen.sh b/autogen.sh index 0d7ba05..63be95a 100755 --- a/autogen.sh +++ b/autogen.sh @@ -94,10 +94,9 @@ while getopts "$optspec" optchar; do echo echo " -h Print this help message." echo - echo " -p Used by THG to ensure that particular versions" - echo " of the autotools are used and hard-codes" - echo " autotools paths to THG machines. Not for" - echo " non-HDF-Group users!" + echo " -p Used by THG to use hard-codes autotools" + echo " paths on THG machines. Not for non-HDF-Group" + echo " users!" echo echo " -v Show more verbose output." echo @@ -107,7 +106,7 @@ while getopts "$optspec" optchar; do exit 0 ;; p) - echo "Setting production mode..." + echo "Setting THG production mode..." echo production=true ;; @@ -128,92 +127,33 @@ if [ "$production" = true ] ; then # Production mode # - # Hard-code canonical HDF Group tool locations and ensure - # version numbers are correct. - - # Production versions of the tools - AUTOCONF_VERSION="autoconf (GNU Autoconf) 2.69" - AUTOMAKE_VERSION="automake (GNU automake) 1.14.1" - AUTOHEADER_VERSION="autoheader (GNU Autoconf) 2.69" - ACLOCAL_VERSION="aclocal (GNU automake) 1.14.1" - LIBTOOL_VERSION="(GNU libtool) 2.4.2" - M4_VERSION="m4 (GNU M4) 1.4.17" - BISON_VERSION="bison (GNU Bison) 2.7" - FLEX_VERSION="flex 2.5.37" + # Hard-code canonical HDF Group tool locations. # If paths to tools are not specified, assume they are - # located in /mnt/hdf/packages and set paths accordingly. + # located in /usr/hdf/bin/AUTOTOOLS and set paths accordingly. if test -z ${HDF5_AUTOCONF}; then - HDF5_AUTOCONF=/mnt/hdf/packages/autoconf/autoconf-2.69/bin/autoconf + HDF5_AUTOCONF=/usr/hdf/bin/AUTOTOOLS/autoconf fi if test -z ${HDF5_AUTOMAKE}; then - HDF5_AUTOMAKE=/mnt/hdf/packages/automake/automake-1.14.1/bin/automake-1.14 + HDF5_AUTOMAKE=/usr/hdf/bin/AUTOTOOLS/automake fi if test -z ${HDF5_AUTOHEADER}; then - HDF5_AUTOHEADER=/mnt/hdf/packages/autoconf/autoconf-2.69/bin/autoheader + HDF5_AUTOHEADER=/usr/hdf/bin/AUTOTOOLS/autoheader fi if test -z ${HDF5_ACLOCAL}; then - HDF5_ACLOCAL=/mnt/hdf/packages/automake/automake-1.14.1/bin/aclocal-1.14 + HDF5_ACLOCAL=/usr/hdf/bin/AUTOTOOLS/aclocal fi if test -z ${HDF5_LIBTOOL}; then - HDF5_LIBTOOL=/mnt/hdf/packages/libtool/libtool-2.4.2/bin/libtool + HDF5_LIBTOOL=/usr/hdf/bin/AUTOTOOLS/libtool fi if test -z ${HDF5_M4}; then - HDF5_M4=/mnt/hdf/packages/m4/m4-1.4.17/bin/m4 + HDF5_M4=/usr/hdf/bin/AUTOTOOLS/m4 fi if test -z ${HDF5_BISON}; then - HDF5_BISON=/usr/hdf/bin/bison + HDF5_BISON=/usr/hdf/bin/AUTOTOOLS/bison fi if test -z ${HDF5_FLEX}; then - HDF5_FLEX=/usr/hdf/bin/flex - fi - - # Check version numbers of all autotools against the "correct" versions - AC_VERS=`${HDF5_AUTOCONF} --version 2>&1 | grep "^${AUTOCONF_VERSION}"` - if test -z "${AC_VERS}"; then - echo "${HDF5_AUTOCONF} version is not ${AUTOCONF_VERSION}" - ${HDF5_AUTOCONF} --version - exit 1 - fi - AM_VERS=`${HDF5_AUTOMAKE} --version 2>&1 | grep "^${AUTOMAKE_VERSION}"` - if test -z "${AM_VERS}"; then - echo "${HDF5_AUTOMAKE} version is not ${AUTOMAKE_VERSION}" - ${HDF5_AUTOMAKE} --version - exit 1 - fi - AH_VERS=`${HDF5_AUTOHEADER} --version 2>&1 | grep "^${AUTOHEADER_VERSION}"` - if test -z "${AH_VERS}"; then - echo "${HDF5_AUTOHEADER} version is not ${AUTOHEADER_VERSION}" - ${HDF5_AUTOHEADER} --version - exit 1 - fi - AL_VERS=`${HDF5_ACLOCAL} --version 2>&1 | grep "^${ACLOCAL_VERSION}"` - if test -z "${AL_VERS}"; then - echo "${HDF5_ACLOCAL} version is not ${ACLOCAL_VERSION}" - ${HDF5_ACLOCAL} --version - exit 1 - fi - LT_VERS=`${HDF5_LIBTOOL} --version 2>&1 | grep "${LIBTOOL_VERSION}"` - if test -z "${LT_VERS}"; then - echo "${HDF5_LIBTOOL} version is not ${LIBTOOL_VERSION}" - ${HDF5_LIBTOOL} --version - exit 1 - fi - M4_VERS=`${HDF5_M4} --version 2>&1 | grep "${M4_VERSION}"` - if test -z "${M4_VERS}"; then - echo "${HDF5_M4} version is not ${M4_VERSION}" - ${HDF5_M4} --version - exit 1 - fi - BI_VERS=`${HDF5_BISON} --version 2>&1 | grep "^${BISON_VERSION}"` - if test -z "${BI_VERS}"; then - echo "${HDF5_BISON} version is not ${BISON_VERSION}" - exit 1 - fi - FL_VERS=`${HDF5_FLEX} --version 2>&1 | grep "^${FLEX_VERSION}"` - if test -z "${FL_VERS}"; then - echo "${HDF5_FLEX} version is not ${FLEX_VERSION}" - exit 1 + HDF5_FLEX=/usr/hdf/bin/AUTOTOOLS/flex fi else -- cgit v0.12 From 431c69474c31f7e535f0e9ed3256563e945f5c19 Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Mon, 28 Sep 2015 15:23:46 -0500 Subject: [svn-r27903] Add extra line for replacement from revision 27898 --- config/cmake/HDF5_Process_Flex_Files.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/config/cmake/HDF5_Process_Flex_Files.cmake b/config/cmake/HDF5_Process_Flex_Files.cmake index 2904d2a..5947fb8 100644 --- a/config/cmake/HDF5_Process_Flex_Files.cmake +++ b/config/cmake/HDF5_Process_Flex_Files.cmake @@ -12,6 +12,7 @@ if (FILE_PARSE) # adding a perl command to find and replace this function declaration in # H5LTparse.c. file (READ ${FILE_PARSE} TEST_STREAM) + string (REGEX REPLACE "int yyparse" "hid_t yyparse" TEST_STREAM "${TEST_STREAM}") string (REGEX REPLACE "int\nyyparse" "hid_t\nyyparse" TEST_STREAM "${TEST_STREAM}") string (REGEX REPLACE "int H5LTyyparse" "hid_t H5LTyyparse" TEST_STREAM "${TEST_STREAM}") file (WRITE ${FILE_PARSE} "${TEST_STREAM}") -- cgit v0.12 From 179d122d59cda7b13a5ece59747075a00df81ed0 Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Mon, 28 Sep 2015 15:43:25 -0500 Subject: [svn-r27904] Correct missing target name chars --- config/cmake/HDF5_Process_Flex_Files.cmake | 10 ++++++---- hl/src/CMakeLists.txt | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/config/cmake/HDF5_Process_Flex_Files.cmake b/config/cmake/HDF5_Process_Flex_Files.cmake index 5947fb8..6ada04c 100644 --- a/config/cmake/HDF5_Process_Flex_Files.cmake +++ b/config/cmake/HDF5_Process_Flex_Files.cmake @@ -47,8 +47,9 @@ if (FILE_PARSE) ") file (APPEND ${FILE_PARSE} "${TEST_STREAM}") message (STATUS "processing pragma in ${FILE_PARSE}") - EXECUTE_PROCESS ( - COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/${FILE_PARSE}.timestamp + execute_process ( + COMMAND ${CMAKE_COMMAND} -E touch ${FILE_PARSE}.timestamp + DEPENDS "${FILE_PARSE}" ) endif (FILE_PARSE) @@ -82,7 +83,8 @@ if (FILE_ANALYZE) ") file (APPEND ${FILE_ANALYZE} "${TEST_STREAM}") message (STATUS "processing pragma in ${FILE_ANALYZE}") - EXECUTE_PROCESS ( - COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/${FILE_ANALYZE}.timestamp + execute_process ( + COMMAND ${CMAKE_COMMAND} -E touch ${FILE_ANALYZE}.timestamp + DEPENDS "${FILE_ANALYZE}" ) endif (FILE_ANALYZE) diff --git a/hl/src/CMakeLists.txt b/hl/src/CMakeLists.txt index 1778ae0..a1922ba 100644 --- a/hl/src/CMakeLists.txt +++ b/hl/src/CMakeLists.txt @@ -28,14 +28,14 @@ if (HDF5_GENERATE_HEADERS) set_source_files_properties (${CMAKE_CURRENT_BINARY_DIR}/H5LTparse.h GENERATED) add_custom_command ( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/H5LTparse.timestamp + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/H5LTparse.c.timestamp COMMAND "${CMAKE_COMMAND}" -D "FILE_PARSE=H5LTparse.c" -P "${HDF_RESOURCES_DIR}/HDF5_Process_Flex_Files.cmake" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} ) add_custom_command ( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/H5LTanalyze.timestamp + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/H5LTanalyze.c.timestamp COMMAND "${CMAKE_COMMAND}" -D "FILE_ANALYZE=H5LTanalyze.c" -P "${HDF_RESOURCES_DIR}/HDF5_Process_Flex_Files.cmake" -- cgit v0.12 From 7b7649aa8172bfff4e49ee97211d834261d50230 Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Mon, 28 Sep 2015 16:31:00 -0500 Subject: [svn-r27905] Add depends to be sure file exists --- hl/src/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hl/src/CMakeLists.txt b/hl/src/CMakeLists.txt index a1922ba..8ae5173 100644 --- a/hl/src/CMakeLists.txt +++ b/hl/src/CMakeLists.txt @@ -32,6 +32,7 @@ if (HDF5_GENERATE_HEADERS) COMMAND "${CMAKE_COMMAND}" -D "FILE_PARSE=H5LTparse.c" -P "${HDF_RESOURCES_DIR}/HDF5_Process_Flex_Files.cmake" + DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/H5LTparse.c ${CMAKE_CURRENT_BINARY_DIR}/H5LTparse.h" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} ) add_custom_command ( @@ -39,6 +40,7 @@ if (HDF5_GENERATE_HEADERS) COMMAND "${CMAKE_COMMAND}" -D "FILE_ANALYZE=H5LTanalyze.c" -P "${HDF_RESOURCES_DIR}/HDF5_Process_Flex_Files.cmake" + DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/H5LTanalyze.c" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} ) add_custom_target (process_gen_H5LT DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/H5LTparse.c.timestamp ${CMAKE_CURRENT_BINARY_DIR}/H5LTanalyze.c.timestamp) -- cgit v0.12 From 2557782f245f02d8b434759854a30ed18b9d8649 Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Tue, 29 Sep 2015 08:32:43 -0500 Subject: [svn-r27906] Remove header file name as it is not a direct target (derived during BISON process). --- hl/src/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hl/src/CMakeLists.txt b/hl/src/CMakeLists.txt index 8ae5173..fd99ce8 100644 --- a/hl/src/CMakeLists.txt +++ b/hl/src/CMakeLists.txt @@ -32,7 +32,7 @@ if (HDF5_GENERATE_HEADERS) COMMAND "${CMAKE_COMMAND}" -D "FILE_PARSE=H5LTparse.c" -P "${HDF_RESOURCES_DIR}/HDF5_Process_Flex_Files.cmake" - DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/H5LTparse.c ${CMAKE_CURRENT_BINARY_DIR}/H5LTparse.h" + DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/H5LTparse.c" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} ) add_custom_command ( -- cgit v0.12 From ef2885c5cad04b31e8b5c9b5ea9016348e99950c Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Tue, 29 Sep 2015 09:53:52 -0500 Subject: [svn-r27908] Give cache tests extra time for VFD tests --- test/CMakeTests.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/CMakeTests.cmake b/test/CMakeTests.cmake index 08beaa7..ebd142f 100644 --- a/test/CMakeTests.cmake +++ b/test/CMakeTests.cmake @@ -1158,10 +1158,12 @@ if (HDF5_TEST_VFD) set_tests_properties (VFD-${vfdname}-flush2 PROPERTIES DEPENDS VFD-${vfdname}-flush1) set_tests_properties (VFD-${vfdname}-flush1 PROPERTIES TIMEOUT 10) set_tests_properties (VFD-${vfdname}-flush2 PROPERTIES TIMEOUT 10) + set_tests_properties (VFD-${vfdname}-cache PROPERTIES TIMEOUT 1800) if (BUILD_SHARED_LIBS) set_tests_properties (VFD-${vfdname}-flush2-shared PROPERTIES DEPENDS VFD-${vfdname}-flush1-shared) set_tests_properties (VFD-${vfdname}-flush1-shared PROPERTIES TIMEOUT 10) set_tests_properties (VFD-${vfdname}-flush2-shared PROPERTIES TIMEOUT 10) + set_tests_properties (VFD-${vfdname}-cache-shared PROPERTIES TIMEOUT 1800) endif (BUILD_SHARED_LIBS) if (HDF5_TEST_FHEAP_VFD) add_test ( -- cgit v0.12 From ea70d11227bee77e9fc34f0435165365842bd138 Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Tue, 29 Sep 2015 09:55:35 -0500 Subject: [svn-r27909] Exclude CYGWIN --- test/CMakeTests.cmake | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/test/CMakeTests.cmake b/test/CMakeTests.cmake index ebd142f..205600a 100644 --- a/test/CMakeTests.cmake +++ b/test/CMakeTests.cmake @@ -1158,12 +1158,16 @@ if (HDF5_TEST_VFD) set_tests_properties (VFD-${vfdname}-flush2 PROPERTIES DEPENDS VFD-${vfdname}-flush1) set_tests_properties (VFD-${vfdname}-flush1 PROPERTIES TIMEOUT 10) set_tests_properties (VFD-${vfdname}-flush2 PROPERTIES TIMEOUT 10) - set_tests_properties (VFD-${vfdname}-cache PROPERTIES TIMEOUT 1800) + if (NOT CYGWIN) + set_tests_properties (VFD-${vfdname}-cache PROPERTIES TIMEOUT 1800) + endif (NOT CYGWIN) if (BUILD_SHARED_LIBS) set_tests_properties (VFD-${vfdname}-flush2-shared PROPERTIES DEPENDS VFD-${vfdname}-flush1-shared) set_tests_properties (VFD-${vfdname}-flush1-shared PROPERTIES TIMEOUT 10) set_tests_properties (VFD-${vfdname}-flush2-shared PROPERTIES TIMEOUT 10) - set_tests_properties (VFD-${vfdname}-cache-shared PROPERTIES TIMEOUT 1800) + if (NOT CYGWIN) + set_tests_properties (VFD-${vfdname}-cache-shared PROPERTIES TIMEOUT 1800) + endif (NOT CYGWIN) endif (BUILD_SHARED_LIBS) if (HDF5_TEST_FHEAP_VFD) add_test ( -- cgit v0.12 From e8073c0d80189b1d1c8e5df94abe72b249f5aab8 Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Tue, 29 Sep 2015 12:23:55 -0500 Subject: [svn-r27910] Rework flex-bison generated files to eliminate dual depends when building both shared and static --- config/cmake/HDF5_Process_Flex_Files.cmake | 28 +++++++---------- hl/src/CMakeLists.txt | 48 +++++++++++++----------------- 2 files changed, 32 insertions(+), 44 deletions(-) diff --git a/config/cmake/HDF5_Process_Flex_Files.cmake b/config/cmake/HDF5_Process_Flex_Files.cmake index 6ada04c..2306e93 100644 --- a/config/cmake/HDF5_Process_Flex_Files.cmake +++ b/config/cmake/HDF5_Process_Flex_Files.cmake @@ -1,6 +1,6 @@ # post process flex/bison files -message (STATUS "File: ${FILE_PARSE} ${FILE_ANALYZE}") +message (STATUS "File: ${GEN_DIR} ${FILE_PARSE} ${FILE_ANALYZE}") if (FILE_PARSE) # fix H5LTparse.c to declare H5LTyyparse return type as an hid_t @@ -11,19 +11,19 @@ if (FILE_PARSE) # I propose to not use flex to generate this function, but for now I am # adding a perl command to find and replace this function declaration in # H5LTparse.c. - file (READ ${FILE_PARSE} TEST_STREAM) + file (READ ${GEN_DIR}/${FILE_PARSE}.c TEST_STREAM) string (REGEX REPLACE "int yyparse" "hid_t yyparse" TEST_STREAM "${TEST_STREAM}") string (REGEX REPLACE "int\nyyparse" "hid_t\nyyparse" TEST_STREAM "${TEST_STREAM}") string (REGEX REPLACE "int H5LTyyparse" "hid_t H5LTyyparse" TEST_STREAM "${TEST_STREAM}") - file (WRITE ${FILE_PARSE} "${TEST_STREAM}") + file (WRITE ${FILE_PARSE}.c "${TEST_STREAM}") message (STATUS "replacing signature in H5LTparse.c") # Add code that disables warnings in the flex/bison-generated code. # # Note that the GCC pragmas did not exist until gcc 4.2. Earlier versions # will simply ignore them, but we want to avoid those warnings. - file (READ ${FILE_PARSE} TEST_STREAM) - file (WRITE ${FILE_PARSE} " + file (READ ${FILE_PARSE}.c TEST_STREAM) + file (WRITE ${FILE_PARSE}.c " #if __GNUC__ >= 4 && __GNUC_MINOR__ >=2\n #pragma GCC diagnostic ignored \"-Wconversion\"\n #pragma GCC diagnostic ignored \"-Wimplicit-function-declaration\"\n @@ -45,12 +45,10 @@ if (FILE_PARSE) #pragma warning(push, 1)\n #endif\n ") - file (APPEND ${FILE_PARSE} "${TEST_STREAM}") - message (STATUS "processing pragma in ${FILE_PARSE}") - execute_process ( - COMMAND ${CMAKE_COMMAND} -E touch ${FILE_PARSE}.timestamp - DEPENDS "${FILE_PARSE}" - ) + file (APPEND ${FILE_PARSE}.c "${TEST_STREAM}") + message (STATUS "processed pragma in ${FILE_PARSE}") + file (READ ${GEN_DIR}/${FILE_PARSE}.h TEST_STREAM) + file (WRITE ${FILE_PARSE}.h "${TEST_STREAM}") endif (FILE_PARSE) if (FILE_ANALYZE) @@ -58,7 +56,7 @@ if (FILE_ANALYZE) # # Note that the GCC pragmas did not exist until gcc 4.2. Earlier versions # will simply ignore them, but we want to avoid those warnings. - file (READ ${FILE_ANALYZE} TEST_STREAM) + file (READ ${GEN_DIR}/${FILE_ANALYZE} TEST_STREAM) file (WRITE ${FILE_ANALYZE} " #if __GNUC__ >= 4 && __GNUC_MINOR__ >=2\n #pragma GCC diagnostic ignored \"-Wconversion\"\n @@ -82,9 +80,5 @@ if (FILE_ANALYZE) #endif\n ") file (APPEND ${FILE_ANALYZE} "${TEST_STREAM}") - message (STATUS "processing pragma in ${FILE_ANALYZE}") - execute_process ( - COMMAND ${CMAKE_COMMAND} -E touch ${FILE_ANALYZE}.timestamp - DEPENDS "${FILE_ANALYZE}" - ) + message (STATUS "processed pragma in ${FILE_ANALYZE}") endif (FILE_ANALYZE) diff --git a/hl/src/CMakeLists.txt b/hl/src/CMakeLists.txt index fd99ce8..1821ec0 100644 --- a/hl/src/CMakeLists.txt +++ b/hl/src/CMakeLists.txt @@ -6,53 +6,47 @@ if (HDF5_GENERATE_HEADERS) if (BISON_FOUND) find_package (FLEX) if (FLEX_FOUND) - BISON_TARGET (H5LT_PARSER H5LTparse.y ${CMAKE_CURRENT_BINARY_DIR}/H5LTparse.c COMPILE_FLAGS "-d -pH5LTyy") + BISON_TARGET (H5LT_PARSER H5LTparse.y ${CMAKE_CURRENT_BINARY_DIR}/genLT/H5LTparse.c COMPILE_FLAGS "-d -pH5LTyy") if (WIN32) - FLEX_TARGET (H5LT_SCANNER H5LTanalyze.l ${CMAKE_CURRENT_BINARY_DIR}/H5LTanalyze.c COMPILE_FLAGS "--wincompat --nounistd -PH5LTyy") + FLEX_TARGET (H5LT_SCANNER H5LTanalyze.l ${CMAKE_CURRENT_BINARY_DIR}/genLT/H5LTanalyze.c COMPILE_FLAGS "--wincompat --nounistd -PH5LTyy") else (WIN32) - FLEX_TARGET (H5LT_SCANNER H5LTanalyze.l ${CMAKE_CURRENT_BINARY_DIR}/H5LTanalyze.c COMPILE_FLAGS "--nounistd -PH5LTyy") + FLEX_TARGET (H5LT_SCANNER H5LTanalyze.l ${CMAKE_CURRENT_BINARY_DIR}/genLT/H5LTanalyze.c COMPILE_FLAGS "--nounistd -PH5LTyy") endif (WIN32) ADD_FLEX_BISON_DEPENDENCY(H5LT_SCANNER H5LT_PARSER) if (BISON_H5LT_PARSER_DEFINED AND FLEX_H5LT_SCANNER_DEFINED) include_directories(${CMAKE_CURRENT_BINARY_DIR}) - set (HL_SRCS - ${CMAKE_CURRENT_BINARY_DIR}/H5LTanalyze.c - ${CMAKE_CURRENT_BINARY_DIR}/H5LTparse.c - ) - set (HL_HEADERS - ${CMAKE_CURRENT_BINARY_DIR}/H5LTparse.h - ) - set_source_files_properties (${CMAKE_CURRENT_BINARY_DIR}/H5LTanalyze.c GENERATED) - set_source_files_properties (${CMAKE_CURRENT_BINARY_DIR}/H5LTparse.c GENERATED) - set_source_files_properties (${CMAKE_CURRENT_BINARY_DIR}/H5LTparse.h GENERATED) add_custom_command ( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/H5LTparse.c.timestamp + OUTPUT H5LTparse.c H5LTparse.h COMMAND "${CMAKE_COMMAND}" - -D "FILE_PARSE=H5LTparse.c" + -D "GEN_DIR=genLT" + -D "FILE_PARSE=H5LTparse" -P "${HDF_RESOURCES_DIR}/HDF5_Process_Flex_Files.cmake" - DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/H5LTparse.c" + DEPENDS "genLT/H5LTparse.c" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} ) add_custom_command ( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/H5LTanalyze.c.timestamp + OUTPUT H5LTanalyze.c COMMAND "${CMAKE_COMMAND}" + -D "GEN_DIR=genLT" -D "FILE_ANALYZE=H5LTanalyze.c" -P "${HDF_RESOURCES_DIR}/HDF5_Process_Flex_Files.cmake" - DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/H5LTanalyze.c" + DEPENDS "genLT/H5LTanalyze.c" + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + ) + add_custom_target (process_gen_H5LT + DEPENDS H5LTparse.c H5LTanalyze.c WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} ) - add_custom_target (process_gen_H5LT DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/H5LTparse.c.timestamp ${CMAKE_CURRENT_BINARY_DIR}/H5LTanalyze.c.timestamp) -# add_custom_target (process_gen_H5LT -# COMMAND "${CMAKE_COMMAND}" -# -D "FILE_PARSE=${CMAKE_CURRENT_BINARY_DIR}/H5LTparse.c" -# -D "FILE_ANALYSE=${CMAKE_CURRENT_BINARY_DIR}/H5LTanalyze.c" -# -P "${HDF5_RESOURCE_DIR}/HDF5_Process_Flex_Files.cmake" -# DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/H5LTparse.c ${CMAKE_CURRENT_BINARY_DIR}/H5LTanalyze.c" -# COMMENT "Prepending pragma statements" -# ) + set (HL_SRCS + ${CMAKE_CURRENT_BINARY_DIR}/H5LTanalyze.c + ${CMAKE_CURRENT_BINARY_DIR}/H5LTparse.c + ) + set (HL_HEADERS + ${CMAKE_CURRENT_BINARY_DIR}/H5LTparse.h + ) else (BISON_H5LT_PARSER_DEFINED AND FLEX_H5LT_SCANNER_DEFINED) message (STATUS "Error during generate of files") endif (BISON_H5LT_PARSER_DEFINED AND FLEX_H5LT_SCANNER_DEFINED) -- cgit v0.12 From cc8ed681b0eeaefdfe834d26c3715146f225b381 Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Tue, 29 Sep 2015 12:44:56 -0500 Subject: [svn-r27911] Add back in the build dir --- hl/src/CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hl/src/CMakeLists.txt b/hl/src/CMakeLists.txt index 1821ec0..a21504b 100644 --- a/hl/src/CMakeLists.txt +++ b/hl/src/CMakeLists.txt @@ -18,25 +18,25 @@ if (HDF5_GENERATE_HEADERS) include_directories(${CMAKE_CURRENT_BINARY_DIR}) add_custom_command ( - OUTPUT H5LTparse.c H5LTparse.h + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/H5LTparse.c ${CMAKE_CURRENT_BINARY_DIR}/H5LTparse.h COMMAND "${CMAKE_COMMAND}" -D "GEN_DIR=genLT" -D "FILE_PARSE=H5LTparse" -P "${HDF_RESOURCES_DIR}/HDF5_Process_Flex_Files.cmake" - DEPENDS "genLT/H5LTparse.c" + DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/genLT/H5LTparse.c" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} ) add_custom_command ( - OUTPUT H5LTanalyze.c + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/H5LTanalyze.c COMMAND "${CMAKE_COMMAND}" -D "GEN_DIR=genLT" -D "FILE_ANALYZE=H5LTanalyze.c" -P "${HDF_RESOURCES_DIR}/HDF5_Process_Flex_Files.cmake" - DEPENDS "genLT/H5LTanalyze.c" + DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/genLT/H5LTanalyze.c" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} ) add_custom_target (process_gen_H5LT - DEPENDS H5LTparse.c H5LTanalyze.c + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/H5LTparse.c ${CMAKE_CURRENT_BINARY_DIR}/H5LTanalyze.c WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} ) -- cgit v0.12 From 32ee0d816f7a329ba7e625765186c36dcf054efc Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Tue, 29 Sep 2015 13:59:55 -0500 Subject: [svn-r27913] Need to create the directory for the gen files --- hl/src/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/hl/src/CMakeLists.txt b/hl/src/CMakeLists.txt index a21504b..a90e3c8 100644 --- a/hl/src/CMakeLists.txt +++ b/hl/src/CMakeLists.txt @@ -2,6 +2,7 @@ cmake_minimum_required (VERSION 3.1.0) PROJECT (HDF5_HL_SRC) if (HDF5_GENERATE_HEADERS) + file (MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/genLT") find_package (BISON) if (BISON_FOUND) find_package (FLEX) -- cgit v0.12