[svn-r27465] Merge dual-binary CMake changes

2 files changed, 96 insertions, 9 deletions

diff --git a/fortran/examples/CMakeLists.txt b/fortran/examples/CMakeLists.txt
index 2bf0bf6..fabc5cd 100644
--- a/fortran/examples/CMakeLists.txt
+++ b/fortran/examples/CMakeLists.txt
@@ -40,8 +40,8 @@ set (F2003_examples
 
 foreach (example ${examples})
   add_executable (f90_ex_${example} ${HDF5_F90_EXAMPLES_SOURCE_DIR}/${example}.f90)
-  TARGET_NAMING (f90_ex_${example} ${LIB_TYPE})
-  TARGET_FORTRAN_PROPERTIES (f90_ex_${example} ${LIB_TYPE} " " " ")
+  TARGET_NAMING (f90_ex_${example} STATIC)
+  TARGET_FORTRAN_PROPERTIES (f90_ex_${example} STATIC " " " ")
   target_link_libraries (f90_ex_${example}
       ${HDF5_F90_LIB_TARGET}
       ${HDF5_LIB_TARGET}
@@ -50,15 +50,30 @@ foreach (example ${examples})
   set_target_properties (f90_ex_${example} PROPERTIES
       LINKER_LANGUAGE Fortran
       FOLDER examples/fortran
-      Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}
+      Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/static
   )
+  if (BUILD_SHARED_LIBS)
+    add_executable (f90_ex_${example}-shared ${HDF5_F90_EXAMPLES_SOURCE_DIR}/${example}.f90)
+    TARGET_NAMING (f90_ex_${example}-shared SHARED)
+    TARGET_FORTRAN_PROPERTIES (f90_ex_${example}-shared SHARED " " " ")
+    target_link_libraries (f90_ex_${example}-shared
+        ${HDF5_F90_LIBSH_TARGET}
+        ${HDF5_LIBSH_TARGET}
+    )
+    target_include_directories (f90_ex_${example}-shared PRIVATE ${CMAKE_Fortran_MODULE_DIRECTORY}/shared)
+    set_target_properties (f90_ex_${example}-shared PROPERTIES
+        LINKER_LANGUAGE Fortran
+        FOLDER examples/fortran
+        Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/shared
+    )
+  endif (BUILD_SHARED_LIBS)
 endforeach (example ${examples})
 
 if (HDF5_ENABLE_F2003)
   foreach (example ${F2003_examples})
     add_executable (f03_ex_${example} ${HDF5_F90_EXAMPLES_SOURCE_DIR}/${example}.f90)
-    TARGET_NAMING (f03_ex_${example} ${LIB_TYPE})
-    TARGET_FORTRAN_PROPERTIES (f03_ex_${example} ${LIB_TYPE} " " " ")
+    TARGET_NAMING (f03_ex_${example} STATIC)
+    TARGET_FORTRAN_PROPERTIES (f03_ex_${example} STATIC " " " ")
     target_link_libraries (f03_ex_${example}
         ${HDF5_F90_LIB_TARGET}
         ${HDF5_LIB_TARGET}
@@ -67,15 +82,30 @@ if (HDF5_ENABLE_F2003)
     set_target_properties (f03_ex_${example} PROPERTIES
         LINKER_LANGUAGE Fortran
         FOLDER examples/fortran03
-        Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}
+        Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/static
     )
+    if (BUILD_SHARED_LIBS)
+      add_executable (f03_ex_${example}-shared ${HDF5_F90_EXAMPLES_SOURCE_DIR}/${example}.f90)
+      TARGET_NAMING (f03_ex_${example}-shared SHARED)
+      TARGET_FORTRAN_PROPERTIES (f03_ex_${example}-shared SHARED " " " ")
+      target_link_libraries (f03_ex_${example}-shared
+          ${HDF5_F90_LIBSH_TARGET}
+          ${HDF5_LIBSH_TARGET}
+      )
+      target_include_directories (f03_ex_${example}-shared PRIVATE ${CMAKE_Fortran_MODULE_DIRECTORY}/shared)
+      set_target_properties (f03_ex_${example}-shared PROPERTIES
+          LINKER_LANGUAGE Fortran
+          FOLDER examples/fortran03
+          Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/shared
+      )
+    endif (BUILD_SHARED_LIBS)
   endforeach (example ${F2003_examples})
 endif (HDF5_ENABLE_F2003)
 
 if (H5_HAVE_PARALLEL AND MPI_Fortran_FOUND)
   add_executable (f90_ex_ph5example ${HDF5_F90_EXAMPLES_SOURCE_DIR}/ph5example.f90)
-  TARGET_NAMING (f90_ex_ph5example ${LIB_TYPE})
-  TARGET_FORTRAN_PROPERTIES (f90_ex_ph5example ${LIB_TYPE} " " " ")
+  TARGET_NAMING (f90_ex_ph5example STATIC)
+  TARGET_FORTRAN_PROPERTIES (f90_ex_ph5example STATIC " " " ")
   target_link_libraries (f90_ex_ph5example
       ${HDF5_F90_LIB_TARGET}
       ${HDF5_LIB_TARGET}
@@ -85,8 +115,24 @@ if (H5_HAVE_PARALLEL AND MPI_Fortran_FOUND)
   set_target_properties (f90_ex_ph5example PROPERTIES
       LINKER_LANGUAGE Fortran
       FOLDER examples/fortran
-      Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}
+      Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/static
   )
+  if (BUILD_SHARED_LIBS)
+    add_executable (f90_ex_ph5example-shared ${HDF5_F90_EXAMPLES_SOURCE_DIR}/ph5example.f90)
+    TARGET_NAMING (f90_ex_ph5example-shared SHARED)
+    TARGET_FORTRAN_PROPERTIES (f90_ex_ph5example-shared SHARED " " " ")
+    target_link_libraries (f90_ex_ph5example-shared
+        ${HDF5_F90_LIBSH_TARGET}
+        ${HDF5_LIBSH_TARGET}
+        ${MPI_Fortran_LIBRARIES}
+    )
+    target_include_directories (f90_ex_ph5example-shared PRIVATE ${CMAKE_Fortran_MODULE_DIRECTORY}/shared)
+    set_target_properties (f90_ex_ph5example-shared PROPERTIES
+        LINKER_LANGUAGE Fortran
+        FOLDER examples/fortran
+        Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/shared
+    )
+  endif (BUILD_SHARED_LIBS)
 endif (H5_HAVE_PARALLEL AND MPI_Fortran_FOUND)
 
 if (BUILD_TESTING)
diff --git a/fortran/examples/CMakeTests.cmake b/fortran/examples/CMakeTests.cmake
index 57aec53..173984c 100644
--- a/fortran/examples/CMakeTests.cmake
+++ b/fortran/examples/CMakeTests.cmake
@@ -28,6 +28,30 @@
     set_tests_properties (f90_ex-clear-objects PROPERTIES DEPENDS ${last_test})
   endif (NOT "${last_test}" STREQUAL "")
   set (last_test "f90_ex-clear-objects")
+  if (BUILD_SHARED_LIBS)
+    add_test (
+        NAME f90_ex-shared-clear-objects
+        COMMAND    ${CMAKE_COMMAND}
+            -E remove 
+            compound.h5
+            copy1.h5
+            copy2.h5
+            dsetf.h5
+            extend.h5 
+            FORTRAN.h5
+            groupf.h5
+            groupsf.h5
+            h5_cmprss.h5
+            mount1.h5
+            mount2.h5
+            sdsf.h5
+            subset.h5
+    )
+    if (NOT "${last_test}" STREQUAL "")
+      set_tests_properties (f90_ex-shared-clear-objects PROPERTIES DEPENDS ${last_test})
+    endif (NOT "${last_test}" STREQUAL "")
+    set (last_test "f90_ex-shared-clear-objects")
+  endif (BUILD_SHARED_LIBS)
 
 foreach (example ${examples})
   add_test (NAME f90_ex_${example} COMMAND $<TARGET_FILE:f90_ex_${example}>)
@@ -35,6 +59,13 @@ foreach (example ${examples})
     set_tests_properties (f90_ex_${example} PROPERTIES DEPENDS ${last_test})
   endif (NOT "${last_test}" STREQUAL "")
   set (last_test "f90_ex_${example}")
+  if (BUILD_SHARED_LIBS)
+    add_test (NAME f90_ex-shared_${example} COMMAND $<TARGET_FILE:f90_ex_${example}-shared>)
+    if (NOT "${last_test}" STREQUAL "")
+      set_tests_properties (f90_ex-shared_${example} PROPERTIES DEPENDS ${last_test})
+    endif (NOT "${last_test}" STREQUAL "")
+    set (last_test "f90_ex-shared_${example}")
+  endif (BUILD_SHARED_LIBS)
 endforeach (example ${examples})
 
 if (HDF5_ENABLE_F2003)
@@ -44,9 +75,19 @@ if (HDF5_ENABLE_F2003)
       set_tests_properties (f03_ex_${example} PROPERTIES DEPENDS ${last_test})
     endif (NOT "${last_test}" STREQUAL "")
     set (last_test "f03_ex_${example}")
+    if (BUILD_SHARED_LIBS)
+      add_test (NAME f03_ex-shared_${example} COMMAND $<TARGET_FILE:f03_ex_${example}-shared>)
+      if (NOT "${last_test}" STREQUAL "")
+        set_tests_properties (f03_ex-shared_${example} PROPERTIES DEPENDS ${last_test})
+      endif (NOT "${last_test}" STREQUAL "")
+      set (last_test "f03_ex-shared_${example}")
+    endif (BUILD_SHARED_LIBS)
   endforeach (example ${F2003_examples})
 endif (HDF5_ENABLE_F2003)
 
 if (H5_HAVE_PARALLEL AND MPI_Fortran_FOUND)
   add_test (NAME f90_ex_ph5example COMMAND ${MPIEXEC} ${MPIEXEC_PREFLAGS} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_POSTFLAGS} $<TARGET_FILE:f90_ex_ph5example>)
+  if (BUILD_SHARED_LIBS)
+    add_test (NAME f90_ex-shared_ph5example COMMAND ${MPIEXEC} ${MPIEXEC_PREFLAGS} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_POSTFLAGS} $<TARGET_FILE:f90_ex_ph5example>)
+  endif (BUILD_SHARED_LIBS)
 endif (H5_HAVE_PARALLEL AND MPI_Fortran_FOUND)