From 7bf6e98bd921c4ef1899144ab8a1f0d66a141141 Mon Sep 17 00:00:00 2001 From: Larry Knox Date: Tue, 20 Nov 2018 12:09:14 -0600 Subject: Move wait_H5init.cmake up to config/cmake. --- MANIFEST | 2 +- config/cmake/scripts/wait_H5Tinit.cmake | 11 ----------- config/cmake/wait_H5Tinit.cmake | 11 +++++++++++ src/CMakeLists.txt | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) delete mode 100755 config/cmake/scripts/wait_H5Tinit.cmake create mode 100644 config/cmake/wait_H5Tinit.cmake diff --git a/MANIFEST b/MANIFEST index a2b1a07..95d8b39 100644 --- a/MANIFEST +++ b/MANIFEST @@ -3196,6 +3196,7 @@ ./config/cmake/UseJavaSymlinks.cmake ./config/cmake/userblockTest.cmake ./config/cmake/vfdTest.cmake +./config/cmake/wait_H5Tinit.cmake ./config/cmake_ext_mod/ConfigureChecks.cmake ./config/cmake_ext_mod/CTestCustom.cmake @@ -3328,7 +3329,6 @@ ./config/cmake/scripts/CTestScript.cmake ./config/cmake/scripts/HDF5config.cmake ./config/cmake/scripts/HDF5options.cmake -./config/cmake/scripts/wait_H5Tinit.cmake # Files generated by autogen ./aclocal.m4 diff --git a/config/cmake/scripts/wait_H5Tinit.cmake b/config/cmake/scripts/wait_H5Tinit.cmake deleted file mode 100755 index c0b4d06..0000000 --- a/config/cmake/scripts/wait_H5Tinit.cmake +++ /dev/null @@ -1,11 +0,0 @@ -cmake_minimum_required (VERSION 3.10) - -message(STATUS "Check for existence of ${HDF5_GENERATED_SOURCE_DIR}/H5Tinit.c") -execute_process(COMMAND ls ${HDF5_GENERATED_SOURCE_DIR}/H5Tinit.c RESULT_VARIABLE H5TI_result OUTPUT_QUIET ERROR_QUIET) -while(H5TI_result) - ctest_sleep(30) - message(STATUS "Checking again for existence of ${HDF5_GENERATED_SOURCE_DIR}/H5Tinit.c") - execute_process(COMMAND ls ${HDF5_GENERATED_SOURCE_DIR}/H5Tinit.c RESULT_VARIABLE H5TI_result OUTPUT_QUIET ERROR_QUIET) -endwhile(H5TI_result) -file (TOUCH "${HDF5_BINARY_DIR}/H5Tinit_created") -message(STATUS "Found ${HDF5_GENERATED_SOURCE_DIR}/H5Tinit.c") diff --git a/config/cmake/wait_H5Tinit.cmake b/config/cmake/wait_H5Tinit.cmake new file mode 100644 index 0000000..c0b4d06 --- /dev/null +++ b/config/cmake/wait_H5Tinit.cmake @@ -0,0 +1,11 @@ +cmake_minimum_required (VERSION 3.10) + +message(STATUS "Check for existence of ${HDF5_GENERATED_SOURCE_DIR}/H5Tinit.c") +execute_process(COMMAND ls ${HDF5_GENERATED_SOURCE_DIR}/H5Tinit.c RESULT_VARIABLE H5TI_result OUTPUT_QUIET ERROR_QUIET) +while(H5TI_result) + ctest_sleep(30) + message(STATUS "Checking again for existence of ${HDF5_GENERATED_SOURCE_DIR}/H5Tinit.c") + execute_process(COMMAND ls ${HDF5_GENERATED_SOURCE_DIR}/H5Tinit.c RESULT_VARIABLE H5TI_result OUTPUT_QUIET ERROR_QUIET) +endwhile(H5TI_result) +file (TOUCH "${HDF5_BINARY_DIR}/H5Tinit_created") +message(STATUS "Found ${HDF5_GENERATED_SOURCE_DIR}/H5Tinit.c") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9660c89..bca5a92 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -956,7 +956,7 @@ if (NOT EXISTS ${HDF5_GENERATED_SOURCE_DIR}/H5Tinit.c) WORKING_DIRECTORY ${HDF5_GENERATED_SOURCE_DIR} ) add_custom_target (gen_H5Tinit - COMMAND ${CMAKE_COMMAND} -P ${HDF5_SOURCE_DIR}/config/cmake/scripts/wait_H5Tinit.cmake + COMMAND ${CMAKE_COMMAND} -P ${HDF5_SOURCE_DIR}/config/cmake/wait_H5Tinit.cmake ) if (BUILD_SHARED_LIBS) add_custom_command ( -- cgit v0.12