[MOAB-dev] r2009 - MOAB/trunk/parallel

[dcthomp at mcs.anl.gov]

Author: dcthomp
Date: 2008-07-14 21:33:21 -0500 (Mon, 14 Jul 2008)
New Revision: 2009

Modified:
   MOAB/trunk/parallel/CMakeLists.txt
   MOAB/trunk/parallel/sort.c
Log:
COMP: Undefine the "sort" macro before redefining it.
ENH: Add mhdf_parallel to CMake build.
NB: Revision numbers are greater than the current year for the forseeable future.


Modified: MOAB/trunk/parallel/CMakeLists.txt
===================================================================
--- MOAB/trunk/parallel/CMakeLists.txt	2008-07-11 21:25:02 UTC (rev 2008)
+++ MOAB/trunk/parallel/CMakeLists.txt	2008-07-15 02:33:21 UTC (rev 2009)
@@ -18,6 +18,12 @@
   )
 endif ( MOAB_USE_HDF AND MOAB_HDF_HAVE_PARALLEL )
 
+if ( MOAB_USE_HDF )
+  include_directories(
+    ${MOAB_SOURCE_DIR}/mhdf/include
+  )
+endif ( MOAB_USE_HDF )
+
 # On Mac OS X, shared libraries may not have circular
 # dependencies (e.g., MOAB depends on MOABpar depends on MOAB).
 # Force a static MOABpar library in this case.
@@ -32,7 +38,7 @@
 endif ( APPLE AND BUILD_SHARED_LIBS )
 
 set_source_files_properties( ${moab_PARALLEL_SRCS}
-  COMPILE_FLAGS "-DIS_BUILDING_MB ${MOAB_DEFINES}"
+  COMPILE_FLAGS "-DIS_BUILDING_MB -DSRCDIR=\"${MOAB_SOURCE_DIR}\" ${MOAB_DEFINES}"
 )
 add_library( MOABpar ${MOABpar_LIB_TYPE}
   ${moab_PARALLEL_SRCS}
@@ -44,10 +50,18 @@
 )
 
 if ( MOAB_USE_MPI AND MPI_FOUND )
-   add_executable ( mbparallelcomm_test mbparallelcomm_test.cpp )
-   target_link_libraries( mbparallelcomm_test MOAB )
-   add_test( TestParallelCommunications ${EXECUTABLE_OUTPUT_PATH}/mbparallelcomm_test )
-   set_source_files_properties( mbparallelcomm_test.cpp
-     COMPILE_FLAGS "-DIS_BUILDING_MB ${MOAB_DEFINES}" )
+  add_executable ( mbparallelcomm_test mbparallelcomm_test.cpp )
+  target_link_libraries( mbparallelcomm_test MOAB )
+  add_test( TestParallelCommunications ${EXECUTABLE_OUTPUT_PATH}/mbparallelcomm_test )
+  set_source_files_properties( mbparallelcomm_test.cpp
+    COMPILE_FLAGS "-DIS_BUILDING_MB ${MOAB_DEFINES}" )
+
+  if ( MOAB_USE_HDF )
+    add_executable( mhdf_parallel mhdf_parallel.c )
+    target_link_libraries( mhdf_parallel MOAB MOABpar mhdf )
+    add_test( TestMHDFParallel ${EXECUTABLE_OUTPUT_PATH}/mhdf_parallel )
+    set_source_files_properties( mhdf_parallel.c
+      COMPILE_FLAGS "-DIS_BUILDING_MB ${MOAB_DEFINES}" )
+  endif ( MOAB_USE_HDF )
 endif ( MOAB_USE_MPI AND MPI_FOUND )
 

Modified: MOAB/trunk/parallel/sort.c
===================================================================
--- MOAB/trunk/parallel/sort.c	2008-07-11 21:25:02 UTC (rev 2008)
+++ MOAB/trunk/parallel/sort.c	2008-07-15 02:33:21 UTC (rev 2009)
@@ -13,6 +13,7 @@
 
 #undef Value
 #undef Data
+#undef sort
 
 #ifdef GLOBAL_INT
 #  define Value ulong