Changeset 917:4980b05606bd in lemon-main

Timestamp:

11/16/10 07:46:01 (14 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Children:

918:8583fb74238c, 921:140c953ad5d1, 1031:ae0b056593a7

Parents:

916:70bee017b584 (diff), 915:234d635ad721 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Phase:

public

Message:

Merge

Files:

• lemon/Makefile.am (modified) (1 diff)
• lemon/Makefile.am (modified) (1 diff)
• test/CMakeLists.txt (modified) (1 diff)
• test/CMakeLists.txt (modified) (3 diffs)
• test/Makefile.am (modified) (2 diffs)
• test/Makefile.am (modified) (2 diffs)

lemon/Makefile.am

@@ -108 +108 @@
         lemon/math.h \
         lemon/min_cost_arborescence.h \
+        lemon/max_cardinality_search.h \
         lemon/nagamochi_ibaraki.h \
         lemon/nauty_reader.h \

lemon/Makefile.am

@@ -109 +109 @@
         lemon/min_cost_arborescence.h \
         lemon/max_cardinality_search.h \
+        lemon/nagamochi_ibaraki.h \
         lemon/nauty_reader.h \
         lemon/network_simplex.h \

test/CMakeLists.txt

@@ -32 +32 @@
   maps_test
   matching_test
+  max_cardinality_search_test
   max_clique_test
   min_cost_arborescence_test

test/CMakeLists.txt

@@ -37 +37 @@
   min_cost_flow_test
   min_mean_cycle_test
+  nagamochi_ibaraki_test
   path_test
   planarity_test
@@ -48 +49 @@
 
 IF(LEMON_HAVE_LP)
-  ADD_EXECUTABLE(lp_test lp_test.cc)
+  IF(${CMAKE_BUILD_TYPE} STREQUAL "Maintainer")
+    ADD_EXECUTABLE(lp_test lp_test.cc)
+  ELSE()
+    ADD_EXECUTABLE(lp_test EXCLUDE_FROM_ALL lp_test.cc)
+  ENDIF()
+
   SET(LP_TEST_LIBS lemon)
 
@@ -84 +90 @@
 
 IF(LEMON_HAVE_MIP)
-  ADD_EXECUTABLE(mip_test mip_test.cc)
+  IF(${CMAKE_BUILD_TYPE} STREQUAL "Maintainer")
+    ADD_EXECUTABLE(mip_test mip_test.cc)
+  ELSE()
+    ADD_EXECUTABLE(mip_test EXCLUDE_FROM_ALL mip_test.cc)
+  ENDIF()
+
   SET(MIP_TEST_LIBS lemon)
 

test/Makefile.am

@@ -34 +34 @@
         test/maps_test \
         test/matching_test \
+        test/max_cardinality_search_test \
         test/max_clique_test \
         test/min_cost_arborescence_test \
@@ -87 +88 @@
 test_mip_test_SOURCES = test/mip_test.cc
 test_matching_test_SOURCES = test/matching_test.cc
+test_max_cardinality_search_test_SOURCES = test/max_cardinality_search_test.cc
 test_max_clique_test_SOURCES = test/max_clique_test.cc
 test_min_cost_arborescence_test_SOURCES = test/min_cost_arborescence_test.cc

test/Makefile.am

@@ -39 +39 @@
         test/min_cost_flow_test \
         test/min_mean_cycle_test \
+        test/nagamochi_ibaraki_test \
         test/path_test \
         test/planarity_test \
@@ -92 +93 @@
 test_min_cost_flow_test_SOURCES = test/min_cost_flow_test.cc
 test_min_mean_cycle_test_SOURCES = test/min_mean_cycle_test.cc
+test_nagamochi_ibaraki_test_SOURCES = test/nagamochi_ibaraki_test.cc
 test_path_test_SOURCES = test/path_test.cc
 test_planarity_test_SOURCES = test/planarity_test.cc