[MOAB-dev] r1930 - in MOAB/trunk: . tools/mbcoupler

[dcthomp at mcs.anl.gov]

Author: dcthomp
Date: 2008-06-25 19:34:42 -0500 (Wed, 25 Jun 2008)
New Revision: 1930

Modified:
   MOAB/trunk/CMakeLists.txt
   MOAB/trunk/tools/mbcoupler/CMakeLists.txt
Log:
ENH: Keep up to date with autoconf build.


Modified: MOAB/trunk/CMakeLists.txt
===================================================================
--- MOAB/trunk/CMakeLists.txt	2008-06-26 00:32:57 UTC (rev 1929)
+++ MOAB/trunk/CMakeLists.txt	2008-06-26 00:34:42 UTC (rev 1930)
@@ -238,7 +238,7 @@
   )
 
   add_subdirectory( refiner )
-  include_directories( refiner )
+  include_directories( ${MOAB_SOURCE_DIR}/refiner )
   target_link_libraries( MOAB
     MOABrefiner
   )

Modified: MOAB/trunk/tools/mbcoupler/CMakeLists.txt
===================================================================
--- MOAB/trunk/tools/mbcoupler/CMakeLists.txt	2008-06-26 00:32:57 UTC (rev 1929)
+++ MOAB/trunk/tools/mbcoupler/CMakeLists.txt	2008-06-26 00:34:42 UTC (rev 1930)
@@ -3,20 +3,40 @@
 )
 
 set( MBCOUPLER_SRCS
+  MBCoupler.cpp
   MBElemUtil.cpp
+  errmem.c
+  findpt.c
+  poly.c
   tensor.c
-  poly.c
-  findpt.c
-  errmem.c
 )
 
 add_library( mbcoupler
   ${MBCOUPLER_SRCS}
 )
+target_link_libraries( mbcoupler MOAB )
+if ( MOAB_USE_MPI )
+  target_link_libraries( mbcoupler MOABpar )
+endif ( MOAB_USE_MPI )
+set_source_files_properties( ${MBCOUPLER_SRCS}
+  COMPILE_FLAGS "${MOAB_DEFINES}"
+)
 
 enable_testing()
 
 # A test for the coupler library
 add_executable( findpt_test findpt_test.cpp )
 target_link_libraries( findpt_test mbcoupler MOAB )
+if ( MOAB_USE_MPI )
+  target_link_libraries( findpt_test MOABpar )
+endif ( MOAB_USE_MPI )
 add_test( TestMBCouplerFindPt ${EXECUTABLE_OUTPUT_PATH}/findpt_test )
+
+if ( MOAB_USE_MPI )
+  # Exercise the coupler and not just findpt:
+  add_executable( mbcoupler_test mbcoupler_test.cpp )
+  set_source_files_properties( mbcoupler_test.cpp
+    COMPILE_FLAGS "${MOAB_DEFINES}" )
+  target_link_libraries( mbcoupler_test mbcoupler MOAB MOABpar )
+  add_test( TestMBCoupler ${EXECUTABLE_OUTPUT_PATH}/mbcoupler_test )
+endif ( MOAB_USE_MPI )