From ccd6248532a7b1030fcfa571607a7cd16228b354 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
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 $<TARGET_FILE:H5detect>)
@@ -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 $<TARGET_FILE:H5make_libsettings>)
-- 
cgit v0.12