Merge pull request #884 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop

* commit 'b57c5490e0901c451a77a356ceb1f6071dc89123':
  JHDFFV-10398 add note
  HDFFV-10398 fix detection of repeat checks
  HDFFV-10398 add support for Emscriptem build system
  HDFFV-10398 avoid sanitizer failures
  HDFFV-10398 - avoid ubsan crashes
  HDFFV-10398 msvc: use /W0 rather than /w
  HDFFV-10398 Suppress VS 2015 assertion failure popup during try_run
  HDFFV-10398 use the target name for custom commands
  HDFFV-10398 use the simpler add_subdirectory signature
  HDFFV-10398 Honor CMAKE_MODULE_PATH when including check modules

5 files changed, 14 insertions, 16 deletions

diff --git a/hl/CMakeLists.txt b/hl/CMakeLists.txt
index a47e023..d80b4f9 100644
--- a/hl/CMakeLists.txt
+++ b/hl/CMakeLists.txt
@@ -12,21 +12,21 @@ add_definitions (${HDF_EXTRA_C_FLAGS})
 #-----------------------------------------------------------------------------
 INCLUDE_DIRECTORIES (${HDF5_HL_SOURCE_DIR}/src )
 
-add_subdirectory (${HDF5_HL_SOURCE_DIR}/src ${HDF5_HL_BINARY_DIR}/src)
+add_subdirectory (src)
 
 #-- Build the High level Tools
 if (HDF5_BUILD_TOOLS)
-  add_subdirectory (${HDF5_HL_SOURCE_DIR}/tools ${HDF5_HL_BINARY_DIR}/tools)
+  add_subdirectory (tools)
 endif ()
 
 #-- Add High Level Examples
 if (HDF5_BUILD_EXAMPLES)
-  add_subdirectory (${HDF5_HL_SOURCE_DIR}/examples ${HDF5_HL_BINARY_DIR}/examples)
+  add_subdirectory (examples)
 endif ()
 
 #-- Build the Unit testing if requested
 if (NOT HDF5_EXTERNALLY_CONFIGURED)
   if (BUILD_TESTING)
-    add_subdirectory (${HDF5_HL_SOURCE_DIR}/test ${HDF5_HL_BINARY_DIR}/test)
+    add_subdirectory (test)
   endif ()
 endif ()
diff --git a/hl/c++/CMakeLists.txt b/hl/c++/CMakeLists.txt
index 91bfa14..9a1d059 100644
--- a/hl/c++/CMakeLists.txt
+++ b/hl/c++/CMakeLists.txt
@@ -4,13 +4,13 @@ PROJECT (HDF5_HL_CPP)
 #-----------------------------------------------------------------------------
 # Main HL lib is in /src
 #-----------------------------------------------------------------------------
-add_subdirectory (${HDF5_HL_CPP_SOURCE_DIR}/src ${HDF5_HL_CPP_BINARY_DIR}/src)
+add_subdirectory (src)
 
 # --------------------------------------------------------------------
 #  Add in the examples for the Packet Table codes
 # --------------------------------------------------------------------
 if (HDF5_BUILD_EXAMPLES)
-  add_subdirectory (${HDF5_HL_CPP_SOURCE_DIR}/examples ${HDF5_HL_CPP_BINARY_DIR}/examples)
+  add_subdirectory (examples)
 endif ()
 
 # --------------------------------------------------------------------
@@ -18,5 +18,5 @@ endif ()
 # --------------------------------------------------------------------
 
 if (BUILD_TESTING)
-  add_subdirectory (${HDF5_HL_CPP_SOURCE_DIR}/test ${HDF5_HL_CPP_BINARY_DIR}/test)
+  add_subdirectory (test)
 endif ()
diff --git a/hl/fortran/CMakeLists.txt b/hl/fortran/CMakeLists.txt
index c651ce9..00d7517 100644
--- a/hl/fortran/CMakeLists.txt
+++ b/hl/fortran/CMakeLists.txt
@@ -4,18 +4,18 @@ PROJECT (HDF5_HL_F90 C CXX Fortran)
 #-----------------------------------------------------------------------------
 # List Source files
 #-----------------------------------------------------------------------------
-add_subdirectory (${HDF5_HL_F90_SOURCE_DIR}/src ${HDF5_HL_F90_BINARY_DIR}/src)
+add_subdirectory (src)
 
 #-----------------------------------------------------------------------------
 # Build the HL Fortran Examples
 #-----------------------------------------------------------------------------
 if (HDF5_BUILD_EXAMPLES)
-  add_subdirectory (${HDF5_HL_F90_SOURCE_DIR}/examples ${HDF5_HL_F90_BINARY_DIR}/examples)
+  add_subdirectory (examples)
 endif ()
 
 #-----------------------------------------------------------------------------
 # Testing
 #-----------------------------------------------------------------------------
 if (BUILD_TESTING)
-  add_subdirectory (${HDF5_HL_F90_SOURCE_DIR}/test ${HDF5_HL_F90_BINARY_DIR}/test)
+  add_subdirectory (test)
 endif ()
diff --git a/hl/fortran/src/CMakeLists.txt b/hl/fortran/src/CMakeLists.txt
index b1a639a..5ad441c 100644
--- a/hl/fortran/src/CMakeLists.txt
+++ b/hl/fortran/src/CMakeLists.txt
@@ -109,10 +109,9 @@ set (HDF5_HL_F90_F_BASE_SOURCES
     ${HDF5_HL_F90_SRC_SOURCE_DIR}/H5IMff.F90
 )
 
-set (CMD $<TARGET_FILE:H5HL_buildiface>)
 add_custom_command (
     OUTPUT ${HDF5_HL_F90_SRC_BINARY_DIR}/static/H5LTff_gen.F90 ${HDF5_HL_F90_SRC_BINARY_DIR}/H5TBff_gen.F90
-    COMMAND ${CMD}
+    COMMAND $<TARGET_FILE:H5HL_buildiface>
     WORKING_DIRECTORY ${HDF5_HL_F90_SRC_BINARY_DIR}/static
     DEPENDS ${HDF5_HL_F90_F_BASE_SOURCES}
     COMMENT "Generating the H5LTff_gen.F90, H5TBff_gen.F90 files"
@@ -126,10 +125,9 @@ set_source_files_properties (
     PROPERTIES GENERATED TRUE
 )
 if (BUILD_SHARED_LIBS)
-  set (CMDSH $<TARGET_FILE:H5HL_buildiface>)
   add_custom_command (
       OUTPUT ${HDF5_HL_F90_SRC_BINARY_DIR}/shared/H5LTff_gen.F90 ${HDF5_HL_F90_SRC_BINARY_DIR}/shared/H5TBff_gen.F90
-      COMMAND ${CMD}
+      COMMAND $<TARGET_FILE:H5HL_buildiface>
       WORKING_DIRECTORY ${HDF5_HL_F90_SRC_BINARY_DIR}/shared
       DEPENDS ${HDF5_HL_F90_F_BASE_SOURCES}
       COMMENT "Generating the H5LTff_gen.F90, H5TBff_gen.F90 shared files"
diff --git a/hl/tools/CMakeLists.txt b/hl/tools/CMakeLists.txt
index 9536517..43229e8 100644
--- a/hl/tools/CMakeLists.txt
+++ b/hl/tools/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required (VERSION 3.2.2)
 PROJECT (HDF5_HL_TOOLS C CXX)
 
-add_subdirectory (${HDF5_HL_TOOLS_SOURCE_DIR}/gif2h5 ${HDF5_HL_TOOLS_BINARY_DIR}/gif2h5)
+add_subdirectory (gif2h5)
 
-add_subdirectory (${HDF5_HL_TOOLS_SOURCE_DIR}/h5watch ${HDF5_HL_TOOLS_BINARY_DIR}/h5watch)
+add_subdirectory (h5watch)