lcio/src/f77

diff -u -r1.5 -r1.6
--- CMakeLists.txt	2 Jul 2007 10:09:57 -0000	1.5
+++ CMakeLists.txt	28 May 2008 14:03:53 -0000	1.6
@@ -23,7 +23,7 @@

 # loop through list of binaries
 FOREACH( bin ${f77_bins} )
     # create target for binary

-    ADD_EXECUTABLE( f77_${bin} EXCLUDE_FROM_ALL ${bin}.F )

+    ADD_EXECUTABLE( f77_${bin} ${bin}.F )

     # tell bin target to call this bin_XXX target
     ADD_DEPENDENCIES( f77 f77_${bin} )
     # avoid conflicts between library and binary target names

lcio/src/cpp

diff -u -r1.14 -r1.15
--- CMakeLists.txt	5 Feb 2008 10:09:22 -0000	1.14
+++ CMakeLists.txt	28 May 2008 14:03:53 -0000	1.15
@@ -193,18 +193,6 @@

   ADD_LCIO_BIN( readcalibration ) 
   ADD_LCIO_BIN( testvtx ) 
   ADD_LCIO_BIN( lcrtrelation )

-
-  # ctest jobs (call with 'make test')
-  ADD_TEST( t_simjob "${EXECUTABLE_OUTPUT_PATH}/simjob" )
-  ADD_TEST( t_recjob "${EXECUTABLE_OUTPUT_PATH}/recjob" simjob.slcio recjob.slcio )
-  ADD_TEST( t_anajob "${EXECUTABLE_OUTPUT_PATH}/anajob" recjob.slcio )
-  
-  SET_TESTS_PROPERTIES( t_simjob PROPERTIES PASS_REGULAR_EXPRESSION
-      "created  10 runs with  100 events" )
-  SET_TESTS_PROPERTIES( t_recjob PROPERTIES PASS_REGULAR_EXPRESSION
-      "added collection: 'SomeClusters' and 'SomeTracks' to   100 events and added one extra MCParticle to each event." )
-  SET_TESTS_PROPERTIES( t_anajob PROPERTIES PASS_REGULAR_EXPRESSION
-      "100 events read from files:" )

 ENDIF()
 
 

@@ -227,3 +215,55 @@

   PATTERN "*CPPFORT*" EXCLUDE
   PATTERN "*CVS*" EXCLUDE)
 

+
+#------------- ctest stuff (call with ctest or 'make test') ------------
+
+IF( BUILD_LCIO_TESTJOBS )
+    ADD_TEST( t_simjob "${EXECUTABLE_OUTPUT_PATH}/simjob" )
+    ADD_TEST( t_anajob_sim "${EXECUTABLE_OUTPUT_PATH}/anajob" simjob.slcio )
+    ADD_TEST( t_recjob "${EXECUTABLE_OUTPUT_PATH}/recjob" simjob.slcio recjob.slcio )
+    ADD_TEST( t_anajob_rec "${EXECUTABLE_OUTPUT_PATH}/anajob" recjob.slcio )
+
+    SET_TESTS_PROPERTIES( t_simjob EXECUTABLE_OUTPUT_PATH PROPERTIES PASS_REGULAR_EXPRESSION
+        "created  10 runs with  100 events" )
+    SET_TESTS_PROPERTIES( t_anajob_sim PROPERTIES PASS_REGULAR_EXPRESSION
+        "100 events read from files:" )
+    SET_TESTS_PROPERTIES( t_recjob PROPERTIES PASS_REGULAR_EXPRESSION
+        "added collection: 'SomeClusters' and 'SomeTracks' to   100 events and added one extra MCParticle to each event." )
+    SET_TESTS_PROPERTIES( t_anajob_rec PROPERTIES PASS_REGULAR_EXPRESSION
+        "100 events read from files:" )
+ENDIF()
+
+IF( BUILD_F77_TESTJOBS )
+    ADD_TEST( t_simjob_F "${EXECUTABLE_OUTPUT_PATH}/simjob_F" )
+    ADD_TEST( t_anajob_F_sim "${EXECUTABLE_OUTPUT_PATH}/anajob_F" f_simjob.slcio )
+    ADD_TEST( t_recjob_F "${EXECUTABLE_OUTPUT_PATH}/recjob_F" f_simjob.slcio f_recjob.slcio )
+    ADD_TEST( t_anajob_F_rec "${EXECUTABLE_OUTPUT_PATH}/anajob_F" f_recjob.slcio )
+
+    SET_TESTS_PROPERTIES( t_simjob_F PROPERTIES PASS_REGULAR_EXPRESSION
+        "created  10 runs with  100 events" )
+    SET_TESTS_PROPERTIES( t_anajob_F_sim PROPERTIES PASS_REGULAR_EXPRESSION
+        "100 events read from files:" )
+    SET_TESTS_PROPERTIES( t_recjob_F PROPERTIES PASS_REGULAR_EXPRESSION
+        "added collection: 'SomeClusters' and 'SomeTracks'.*to    100 events.*and added one extra MCParticle to each event." )
+    SET_TESTS_PROPERTIES( t_anajob_F_rec PROPERTIES PASS_REGULAR_EXPRESSION
+        "100 events read from files:" )
+ENDIF()
+
+IF( BUILD_LCIO_TESTJOBS AND BUILD_F77_TESTJOBS )
+ 
+    ADD_TEST( t_anajob_cross_sim "${EXECUTABLE_OUTPUT_PATH}/anajob" f_simjob.slcio )
+    ADD_TEST( t_anajob_cross_rec "${EXECUTABLE_OUTPUT_PATH}/anajob" f_recjob.slcio )
+    ADD_TEST( t_anajob_F_cross_sim "${EXECUTABLE_OUTPUT_PATH}/anajob_F" simjob.slcio )
+    ADD_TEST( t_anajob_F_cross_rec "${EXECUTABLE_OUTPUT_PATH}/anajob_F" recjob.slcio )
+
+    SET_TESTS_PROPERTIES( t_anajob_cross_sim PROPERTIES PASS_REGULAR_EXPRESSION
+        "100 events read from files:" )
+    SET_TESTS_PROPERTIES( t_anajob_cross_rec PROPERTIES PASS_REGULAR_EXPRESSION
+        "100 events read from files:" )
+    SET_TESTS_PROPERTIES( t_anajob_F_cross_sim PROPERTIES PASS_REGULAR_EXPRESSION
+        "100 events read from files:" )
+    SET_TESTS_PROPERTIES( t_anajob_F_cross_rec PROPERTIES PASS_REGULAR_EXPRESSION
+        "100 events read from files:" )
+   
+ENDIF()