[svn-r19325] Added parallel build commands.

Corrected use/name of source folder aliases.
Duplicated FindMPI.cmake so that non-c++ compiler is found first (recommemded commands did not work).

Tested: local linux with mpich

10 files changed, 27 insertions, 25 deletions

diff --git a/hl/c++/examples/CMakeLists.txt b/hl/c++/examples/CMakeLists.txt
index 8fcb9bd..2a06b9c 100644
--- a/hl/c++/examples/CMakeLists.txt
+++ b/hl/c++/examples/CMakeLists.txt
@@ -4,8 +4,8 @@ PROJECT (HDF5_HL_CPP_EXAMPLES)
 #-----------------------------------------------------------------------------
 # Setup include Directories
 #-----------------------------------------------------------------------------
-INCLUDE_DIRECTORIES (${HDF5_HL_SOURCE_DIR}/src)
-INCLUDE_DIRECTORIES (${HDF5_HL_CPP_SOURCE_DIR}/src)
+INCLUDE_DIRECTORIES (${HDF5_HL_SRC_DIR}/src)
+INCLUDE_DIRECTORIES (${HDF5_HL_CPP_SRC_DIR}/src)
 
 # --------------------------------------------------------------------
 #  Add in the examples for the Packet Table codes
diff --git a/hl/c++/src/CMakeLists.txt b/hl/c++/src/CMakeLists.txt
index 459520e..afd4cf4 100644
--- a/hl/c++/src/CMakeLists.txt
+++ b/hl/c++/src/CMakeLists.txt
@@ -4,10 +4,11 @@ PROJECT (HDF5_HL_CPP_SRC)
 #-----------------------------------------------------------------------------
 # Define Sources
 #-----------------------------------------------------------------------------
+INCLUDE_DIRECTORIES (${HDF5_HL_SRC_DIR}/src)
+INCLUDE_DIRECTORIES (${HDF5_HL_CPP_SRC_SOURCE_DIR})
+
 SET (HDF5_HL_CPP_SRCS ${HDF5_HL_CPP_SRC_SOURCE_DIR}/H5PacketTable.cpp)
 SET (HDF5_HL_CPP_HDRS ${HDF5_HL_CPP_SRC_SOURCE_DIR}/H5PacketTable.h)
-INCLUDE_DIRECTORIES (${HDF5_HL_SOURCE_DIR}/src)
-INCLUDE_DIRECTORIES (${HDF5_HL_CPP_SRC_SOURCE_DIR})
 
 ADD_LIBRARY ( ${HDF5_HL_CPP_LIB_TARGET} ${LIB_TYPE} ${HDF5_HL_CPP_SRCS})
 TARGET_LINK_LIBRARIES (
diff --git a/hl/c++/test/CMakeLists.txt b/hl/c++/test/CMakeLists.txt
index e9b09da..afcb8fe 100644
--- a/hl/c++/test/CMakeLists.txt
+++ b/hl/c++/test/CMakeLists.txt
@@ -4,17 +4,17 @@ PROJECT (HDF5_HL_CPP_TEST)
 #-----------------------------------------------------------------------------
 # Setup include Directories
 #-----------------------------------------------------------------------------
-INCLUDE_DIRECTORIES (${HDF5_HL_SOURCE_DIR}/src)
-INCLUDE_DIRECTORIES (${HDF5_HL_CPP_SOURCE_DIR}/src)
+INCLUDE_DIRECTORIES (${HDF5_HL_SRC_DIR}/src)
+INCLUDE_DIRECTORIES (${HDF5_HL_SRC_DIR}/c++/src)
 
 # --------------------------------------------------------------------
 # Add in the unit tests for the packet table c++ wrapper
 # --------------------------------------------------------------------
 
 IF (BUILD_TESTING)
-  INCLUDE_DIRECTORIES (${HDF5_TEST_SOURCE_DIR})
-  INCLUDE_DIRECTORIES (${HDF5_HL_SOURCE_DIR}/test)
-  INCLUDE_DIRECTORIES (${HDF5_CPP_SOURCE_DIR}/src)
+  INCLUDE_DIRECTORIES (${HDF5_TEST_SRC_DIR})
+  INCLUDE_DIRECTORIES (${HDF5_HL_SRC_DIR}/test)
+  INCLUDE_DIRECTORIES (${HDF5_CPP_SRC_DIR}/src)
 
   ADD_EXECUTABLE (hl_ptableTest ${HDF5_HL_CPP_TEST_SOURCE_DIR}/ptableTest.cpp)
   H5_NAMING (hl_ptableTest)
diff --git a/hl/fortran/CMakeLists.txt b/hl/fortran/CMakeLists.txt
index 1aca0d7..4c2256c 100644
--- a/hl/fortran/CMakeLists.txt
+++ b/hl/fortran/CMakeLists.txt
@@ -4,12 +4,12 @@ PROJECT(HDF5_HL_F90 C CXX Fortran)
 #-----------------------------------------------------------------------------
 # Setup include Directories
 #-----------------------------------------------------------------------------
-INCLUDE_DIRECTORIES (${HDF5_F90_SOURCE_DIR}/src)
+INCLUDE_DIRECTORIES (${HDF5_F90_SRC_DIR}/src)
 INCLUDE_DIRECTORIES (${HDF5_F90_BINARY_DIR})
 INCLUDE_DIRECTORIES (${HDF5_F90_SRC_BINARY_DIR})
 INCLUDE_DIRECTORIES (${CMAKE_Fortran_MODULE_DIRECTORY})
 
-LINK_DIRECTORIES (${HDF5_SRC_DIR} ${HDF5_FORTRAN_SOURCE_DIR} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
+LINK_DIRECTORIES (${HDF5_SRC_DIR} ${HDF5_F90_SRC_DIR}/src ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
 
 #-----------------------------------------------------------------------------
 # Add debug information (intel Fortran : JB)
diff --git a/hl/fortran/examples/CMakeLists.txt b/hl/fortran/examples/CMakeLists.txt
index bd9a695..3ba6969 100644
--- a/hl/fortran/examples/CMakeLists.txt
+++ b/hl/fortran/examples/CMakeLists.txt
@@ -4,7 +4,7 @@ PROJECT (HDF5_HL_F90_EXAMPLES C CXX Fortran)
 #-----------------------------------------------------------------------------
 # Setup include Directories
 #-----------------------------------------------------------------------------
-INCLUDE_DIRECTORIES (${CMAKE_Fortran_MODULE_DIRECTORY} ${HDF5_F90_BINARY_DIR} ${HDF5_F90_SOURCE_DIR}/src)
+INCLUDE_DIRECTORIES (${CMAKE_Fortran_MODULE_DIRECTORY} ${HDF5_F90_BINARY_DIR} ${HDF5_F90_SRC_DIR}/src)
 LINK_DIRECTORIES (
     ${CMAKE_Fortran_MODULE_DIRECTORY}
     ${HDF5_HL_F90_BINARY_DIR}
@@ -17,7 +17,7 @@ SET (examples
 )
 
 FOREACH (example ${examples})
-  ADD_EXECUTABLE (hl_f90_ex_${example} ${HDF5_HL_EXAMPLES_SOURCE_DIR}/${example}.f90)
+  ADD_EXECUTABLE (hl_f90_ex_${example} ${HDF5_HL_F90_EXAMPLES_SOURCE_DIR}/${example}.f90)
   H5_NAMING (hl_f90_ex_${example})
   IF (WIN32)
     IF (MSVC)
diff --git a/hl/fortran/src/CMakeLists.txt b/hl/fortran/src/CMakeLists.txt
index 07fcb30..f003c49 100644
--- a/hl/fortran/src/CMakeLists.txt
+++ b/hl/fortran/src/CMakeLists.txt
@@ -7,10 +7,10 @@ PROJECT(HDF5_HL_F90_SRC C CXX Fortran)
 INCLUDE_DIRECTORIES (
     ${CMAKE_Fortran_MODULE_DIRECTORY} 
     ${HDF5_F90_BINARY_DIR} 
-    ${HDF5_F90_SOURCE_DIR}/src
+    ${HDF5_F90_SRC_DIR}/src
     ${HDF5_F90_SRC_BINARY_DIR}
     ${HDF5_HL_F90_SRC_SOURCE_DIR}
-    ${HDF5_HL_SOURCE_DIR}/src
+    ${HDF5_HL_SRC_DIR}/src
 )
 LINK_DIRECTORIES (
     ${CMAKE_Fortran_MODULE_DIRECTORY}
diff --git a/hl/fortran/test/CMakeLists.txt b/hl/fortran/test/CMakeLists.txt
index 14bd622..f505dbd 100644
--- a/hl/fortran/test/CMakeLists.txt
+++ b/hl/fortran/test/CMakeLists.txt
@@ -4,7 +4,7 @@ PROJECT (HDF5_HL_FORTRAN_TESTS C CXX Fortran)
 #-----------------------------------------------------------------------------
 # Add Tests
 #-----------------------------------------------------------------------------
-INCLUDE_DIRECTORIES (${CMAKE_Fortran_MODULE_DIRECTORY} ${HDF5_F90_BINARY_DIR} ${HDF5_F90_SOURCE_DIR}/src)
+INCLUDE_DIRECTORIES (${CMAKE_Fortran_MODULE_DIRECTORY} ${HDF5_F90_BINARY_DIR} ${HDF5_F90_SRC_DIR}/src)
 LINK_DIRECTORIES (
     ${CMAKE_Fortran_MODULE_DIRECTORY}
     ${HDF5_HL_F90_BINARY_DIR}
diff --git a/hl/src/CMakeLists.txt b/hl/src/CMakeLists.txt
index 6042853..e34936d 100644
--- a/hl/src/CMakeLists.txt
+++ b/hl/src/CMakeLists.txt
@@ -11,7 +11,7 @@ ENDIF (BUILD_SHARED_LIBS)
 #-----------------------------------------------------------------------------
 # List Source files
 #-----------------------------------------------------------------------------
-INCLUDE_DIRECTORIES (${HDF5_HL_SOURCE_DIR}/src)
+INCLUDE_DIRECTORIES (${HDF5_HL_SRC_DIR}/src)
 
 SET (HL_SRCS
     ${HDF5_HL_SRC_SOURCE_DIR}/H5DS.c
diff --git a/hl/test/CMakeLists.txt b/hl/test/CMakeLists.txt
index 91d7c80..d016aed 100644
--- a/hl/test/CMakeLists.txt
+++ b/hl/test/CMakeLists.txt
@@ -1,4 +1,5 @@
 cmake_minimum_required (VERSION 2.8)
+PROJECT (HDF5_HL_TEST)
 # --------------------------------------------------------------------
 # Notes: When creating unit test executables they should be prefixed
 # with "hl_". This allows for easier filtering of the test suite when
@@ -7,8 +8,6 @@ cmake_minimum_required (VERSION 2.8)
 # which would only run the High Level based unit tests.
 # --------------------------------------------------------------------
 
-PROJECT (HDF5_HL_TEST)
-
 #-----------------------------------------------------------------------------
 # Generate the H5srcdir_str.h file containing user settings needed by compilation
 #-----------------------------------------------------------------------------
@@ -16,7 +15,7 @@ SET (srcdir ${CMAKE_CURRENT_SOURCE_DIR})
 CONFIGURE_FILE (${HDF5_HL_TEST_SOURCE_DIR}/H5srcdir_str.h.in H5srcdir_str.h  @ONLY)
 
 INCLUDE_DIRECTORIES (${CMAKE_CURRENT_BINARY_DIR})
-INCLUDE_DIRECTORIES (${HDF5_TEST_SOURCE_DIR})
+INCLUDE_DIRECTORIES (${HDF5_TEST_SRC_DIR})
 
 # --------------------------------------------------------------------
 #  Macro used to add a unit test
@@ -42,7 +41,9 @@ MACRO (HL_ADD_TEST hl_name files)
 
   ADD_TEST (NAME hl_${hl_name} COMMAND $<TARGET_FILE:hl_${hl_name}>)
 
+  # --------------------------------------------------------------------
   #-- Copy the necessary files.
+  # --------------------------------------------------------------------
   FOREACH (h5_file ${files})
     SET (dest "${HDF5_HL_TEST_BINARY_DIR}/${h5_file}")
     #MESSAGE (STATUS " Copying HL Test File ${h5_file} to ${dest}")
@@ -66,7 +67,7 @@ HL_ADD_TEST (test_table "test_table_be.hdf5;test_table_cray.hdf5;test_table_le.h
 # This executable is used to generate test files for the test_ds test.
 # It should only be run during development when new test files are needed
 # --------------------------------------------------------------------
-IF (NOT BUILD_SHARED_LIBS)
+IF (HDF5_BUILD_GENERATORS AND NOT BUILD_SHARED_LIBS)
   ADD_EXECUTABLE (hl_gen_test_ds gen_test_ds.c)
   H5_NAMING (hl_gen_test_ds)
   IF (WIN32)
@@ -84,4 +85,4 @@ IF (NOT BUILD_SHARED_LIBS)
       ${HDF5_LIB_TARGET}
       ${HDF5_TEST_LIB_TARGET}
   )
-ENDIF (NOT BUILD_SHARED_LIBS)
+ENDIF (HDF5_BUILD_GENERATORS AND NOT BUILD_SHARED_LIBS)
diff --git a/hl/tools/CMakeLists.txt b/hl/tools/CMakeLists.txt
index e8c729d..62a0ea5 100644
--- a/hl/tools/CMakeLists.txt
+++ b/hl/tools/CMakeLists.txt
@@ -14,7 +14,7 @@ SET (GIF2H5_SRCS
 )
 
 #-- Add gif2hdf5 program
-INCLUDE_DIRECTORIES (${HDF5_TOOLS_SOURCE_DIR}/lib)
+INCLUDE_DIRECTORIES (${HDF5_TOOLS_SRC_DIR}/lib)
 INCLUDE_DIRECTORIES (${HDF5_HL_TOOLS_SOURCE_DIR}/gif2h5)
 
 ADD_EXECUTABLE (gif2h5 ${GIF2H5_SRCS})
@@ -55,7 +55,7 @@ TARGET_LINK_LIBRARIES (hdf2gif ${HDF5_HL_LIB_TARGET} ${HDF5_LIB_TARGET} ${HDF5_T
 #  used in the CMake Build system as we rely on the test files that are
 #  shipped with HDF5 source archives
 # --------------------------------------------------------------------
-IF (NOT BUILD_SHARED_LIBS)
+IF (HDF5_BUILD_GENERATORS AND NOT BUILD_SHARED_LIBS)
     ADD_EXECUTABLE (hl_h52gifgentest ${HDF5_HL_TOOLS_SOURCE_DIR}/gif2h5/h52gifgentst.c)
     H5_NAMING (hl_h52gifgentest)
     IF (WIN32)
@@ -69,7 +69,7 @@ IF (NOT BUILD_SHARED_LIBS)
     TARGET_LINK_LIBRARIES (hl_h52gifgentest ${HDF5_HL_LIB_TARGET} ${HDF5_LIB_TARGET})
     
 #    ADD_TEST (NAME hl_h52gifgentest COMMAND $<TARGET_FILE:hl_h52gifgentest>)
-ENDIF (NOT BUILD_SHARED_LIBS)
+ENDIF (HDF5_BUILD_GENERATORS AND NOT BUILD_SHARED_LIBS)
 
 #-----------------------------------------------------------------------------
 # Add file(s) to CMake Install