From 1177e649253e39aa5c8f76cb3374e412c542e415 Mon Sep 17 00:00:00 2001
From: Dana Robinson <derobins@hdfgroup.org>
Date: Tue, 15 Sep 2015 08:01:01 -0500
Subject: [svn-r27787] Merge of r27632-27674 from the trunk.

Tested on: h5committest
---
 MANIFEST                      | 2 --
 config/cmake/HDF5Macros.cmake | 6 +++---
 fortran/src/CMakeLists.txt    | 8 ++++----
 hl/fortran/src/CMakeLists.txt | 8 ++++----
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/MANIFEST b/MANIFEST
index 516d2f4..4b19517 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -844,7 +844,6 @@
 ./test/filter_fail.c
 ./test/flush1.c
 ./test/flush2.c
-# ====distribute this for now. See HDFFV-8236====
 ./test/gen_bad_ohdr.c
 ./test/gen_bad_compound.c
 ./test/gen_bogus.c
@@ -868,7 +867,6 @@
 ./test/gen_sizes_lheap.c
 ./test/gen_specmetaread.c
 ./test/gen_udlinks.c
-# ====end distribute this for now. See HDFFV-8236====
 ./test/getname.c
 ./test/gheap.c
 ./test/group_old.h5
diff --git a/config/cmake/HDF5Macros.cmake b/config/cmake/HDF5Macros.cmake
index aa834e6..9b36f53 100644
--- a/config/cmake/HDF5Macros.cmake
+++ b/config/cmake/HDF5Macros.cmake
@@ -49,7 +49,7 @@ macro (H5_GEN_PERL_FILES)
         OUTPUT ${HDF5_BINARY_DIR}/H5Edefin.h
         PRE_BUILD
         COMMAND ${PERL_EXECUTABLE}
-        ARGS ${HDF5_SOURCE_DIR}/bin/make_err.pl ${HDF5_SOURCE_DIR}/src/H5err.txt
+        ARGS ${HDF5_SOURCE_DIR}/bin/make_err ${HDF5_SOURCE_DIR}/src/H5err.txt
         DEPENDS ${HDF5_SOURCE_DIR}/src/H5err.txt
         COMMENT " Creating err header"
     )
@@ -58,7 +58,7 @@ macro (H5_GEN_PERL_FILES)
         OUTPUT ${HDF5_BINARY_DIR}/H5version.h
         PRE_BUILD
         COMMAND ${PERL_EXECUTABLE}
-        ARGS ${HDF5_SOURCE_DIR}/bin/make_vers.pl ${HDF5_SOURCE_DIR}/src/H5vers.txt
+        ARGS ${HDF5_SOURCE_DIR}/bin/make_vers  ${HDF5_SOURCE_DIR}/src/H5vers.txt
         DEPENDS ${HDF5_SOURCE_DIR}/src/H5vers.txt
        COMMENT " Creating API version macro"
     )
@@ -67,7 +67,7 @@ macro (H5_GEN_PERL_FILES)
         OUTPUT ${HDF5_BINARY_DIR}/H5overflow.h
         PRE_BUILD
         COMMAND ${PERL_EXECUTABLE}
-        ARGS ${HDF5_SOURCE_DIR}/bin/make_overflow.pl ${HDF5_SOURCE_DIR}/src/H5overflow.txt
+        ARGS ${HDF5_SOURCE_DIR}/bin/make_overflow  ${HDF5_SOURCE_DIR}/src/H5overflow.txt
         DEPENDS ${HDF5_SOURCE_DIR}/src/H5overflow.txt
         COMMENT " Creating Assignment overflow macro"
     )
diff --git a/fortran/src/CMakeLists.txt b/fortran/src/CMakeLists.txt
index dc884d5..9beacbf 100644
--- a/fortran/src/CMakeLists.txt
+++ b/fortran/src/CMakeLists.txt
@@ -64,13 +64,13 @@ set_target_properties (H5_buildiface PROPERTIES
     Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}
 )
 
-if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
+if (NOT SKIP_HDF5_FORTRAN_SHARED)
   if (WIN32)
-    set (MODSH_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/shared/\${BUILD_TYPE})
+    set (MOD_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/static/\${BUILD_TYPE})
   else (WIN32)
-    set (MODSH_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/shared)
+    set (MOD_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/static)
   endif (WIN32)
-endif (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
+endif (NOT SKIP_HDF5_FORTRAN_SHARED)
 if (WIN32)
   set (MOD_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/static/\${BUILD_TYPE})
 else (WIN32)
diff --git a/hl/fortran/src/CMakeLists.txt b/hl/fortran/src/CMakeLists.txt
index ead21be..20b1b28 100644
--- a/hl/fortran/src/CMakeLists.txt
+++ b/hl/fortran/src/CMakeLists.txt
@@ -36,13 +36,13 @@ set_target_properties (H5HL_buildiface PROPERTIES
     Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}
 )
 
-if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
+if (NOT SKIP_HDF5_FORTRAN_SHARED)
   if (WIN32)
-    set (MODSH_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/shared/\${BUILD_TYPE})
+    set (MOD_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/static/\${BUILD_TYPE})
   else (WIN32)
-    set (MODSH_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/shared)
+    set (MOD_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/static)
   endif (WIN32)
-endif (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
+endif (NOT SKIP_HDF5_FORTRAN_SHARED)
 if (WIN32)
   set (MOD_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/static/\${BUILD_TYPE})
 else (WIN32)
-- 
cgit v0.12