LEMON/LEMON-official Changeset - r541:4b558ee0d4f5

Repositories » LEMON » LEMON-official

Summary
Changelog
Files
Switch To
- loading...
Options
- Lightweight changelog
- Search
Pull Requests

Changeset - r541:4b558ee0d4f5

« 540:8a1444
« 537:ca1293

542:7f4536 »

r541:4b558ee0d4f5

Tue, 28 Apr 2009 14:42:28

[Not Reviewed]

0 comments (0 inline)

alpar (Alpar Juttner)
alpar@cs.elte.hu

Merge bugfixes #274 and #275

0 12 0

merge 1.0

1 file changed with 35 insertions and 13 deletions:

CMakeLists.txt

configure.ac

demo/CMakeLists.txt

lemon/CMakeLists.txt

lemon/Makefile.am

lemon/bits/default_map.h

lemon/config.h.cmake

lemon/config.h.in

m4/lx_check_cplex.m4

m4/lx_check_glpk.m4

m4/lx_check_soplex.m4

test/CMakeLists.txt

↑ Collapse diff ↑

0 comments (0 inline)

@@ -14,26 +14,28 @@
 		IF(MSVC)
 		  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4250 /wd4355 /wd4800 /wd4996")
 		# Suppressed warnings:
 		# C4250: 'class1' : inherits 'class2::member' via dominance
 		# C4355: 'this' : used in base member initializer list
 		# C4800: 'type' : forcing value to bool 'true' or 'false' (performance warning)
 		# C4996: 'function': was declared deprecated
 		ENDIF(MSVC)
 		INCLUDE(FindDoxygen)
 		INCLUDE(FindGhostscript)
 		ADD_DEFINITIONS(-DHAVE_CONFIG_H)
 		INCLUDE(CheckTypeSize)
-		CHECK_TYPE_SIZE("long long" LONG_LONG)
+		CHECK_TYPE_SIZE("long long" LEMON_LONG_LONG)
 		ENABLE_TESTING()
 		ADD_SUBDIRECTORY(lemon)
 		ADD_SUBDIRECTORY(demo)
 		ADD_SUBDIRECTORY(doc)
 		ADD_SUBDIRECTORY(test)
 		IF(WIN32)
 		  SET(CPACK_PACKAGE_NAME ${PROJECT_NAME})
 		  SET(CPACK_PACKAGE_VENDOR "EGRES")
 		  SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY

@@ -18,25 +18,25 @@
 		AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects nostdinc])
 		AC_CONFIG_SRCDIR([lemon/list_graph.h])
 		AC_CONFIG_HEADERS([config.h lemon/config.h])
 		lx_cmdline_cxxflags_set=${CXXFLAGS+set}
 		dnl Do compilation tests using the C++ compiler.
 		AC_LANG([C++])
 		dnl Check the existence of long long type.
 		AC_CHECK_TYPE(long long, [long_long_found=yes], [long_long_found=no])
 		if test x"$long_long_found" = x"yes"; then
-		  AC_DEFINE([HAVE_LONG_LONG], [1], [Define to 1 if you have long long.])
+		  AC_DEFINE([LEMON_HAVE_LONG_LONG], [1], [Define to 1 if you have long long.])
 		fi
 		dnl Checks for programs.
 		AC_PROG_CXX
 		AC_PROG_CXXCPP
 		AC_PROG_INSTALL
 		AC_DISABLE_SHARED
 		AC_PROG_LIBTOOL
 		AC_CHECK_PROG([doxygen_found],[doxygen],[yes],[no])
 		AC_CHECK_PROG([gs_found],[gs],[yes],[no])

-		INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR})
 		INCLUDE_DIRECTORIES(
 		  ${CMAKE_SOURCE_DIR}
 		  ${PROJECT_BINARY_DIR}
+		)
 		LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/lemon)
 		SET(DEMOS
 		  arg_parser_demo
 		  graph_to_eps_demo
 		  lgf_demo)
 		FOREACH(DEMO_NAME ${DEMOS})
 		  ADD_EXECUTABLE(${DEMO_NAME} ${DEMO_NAME}.cc)
 		  TARGET_LINK_LIBRARIES(${DEMO_NAME} lemon)
 		ENDFOREACH(DEMO_NAME)

-		INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR})
 		INCLUDE_DIRECTORIES(
 		  ${CMAKE_SOURCE_DIR}
 		  ${PROJECT_BINARY_DIR}
+		)
 		CONFIGURE_FILE(
 		  ${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake
 		  ${CMAKE_CURRENT_BINARY_DIR}/config.h
+		)
 		ADD_LIBRARY(lemon
 		  arg_parser.cc
 		  base.cc
 		  color.cc
 		  random.cc
 		  bits/windows.cc
+		)
 		INSTALL(
 		  TARGETS lemon
 		  ARCHIVE DESTINATION lib
 		  COMPONENT library)
 		INSTALL(
 		  DIRECTORY . bits concepts
 		  DESTINATION include/lemon
 		  COMPONENT headers
 		  FILES_MATCHING PATTERN "*.h")
 		INSTALL(
 		  FILES ${CMAKE_CURRENT_BINARY_DIR}/config.h
 		  DESTINATION include/lemon
 		  COMPONENT headers)

@@ -14,24 +14,25 @@
 			lemon/bits/windows.cc
 		#lemon_libemon_la_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS) $(SOPLEX_CXXFLAGS)
 		#lemon_libemon_la_LDFLAGS = $(GLPK_LIBS) $(CPLEX_LIBS) $(SOPLEX_LIBS)
 		lemon_HEADERS += \
 		        lemon/arg_parser.h \
 			lemon/assert.h \
 		        lemon/bfs.h \
 		        lemon/bin_heap.h \
 		        lemon/color.h \
 			lemon/concept_check.h \
 			lemon/config.h \
 		        lemon/counter.h \
 			lemon/core.h \
 		        lemon/dfs.h \
 		        lemon/dijkstra.h \
 		        lemon/dim2.h \
 			lemon/error.h \
 		        lemon/graph_to_eps.h \
 			lemon/kruskal.h \
 			lemon/lgf_reader.h \
 			lemon/lgf_writer.h \
 			lemon/list_graph.h \
 			lemon/maps.h \

RhodeCode

Login to your account

@@ -88,25 +88,25 @@
 		  // long
 		  template <typename _Graph, typename _Item>
 		  struct DefaultMapSelector<_Graph, _Item, signed long> {
 		    typedef VectorMap<_Graph, _Item, signed long> Map;
 		  };
 		  template <typename _Graph, typename _Item>
 		  struct DefaultMapSelector<_Graph, _Item, unsigned long> {
 		    typedef VectorMap<_Graph, _Item, unsigned long> Map;
 		  };
-		#if defined HAVE_LONG_LONG
+		#if defined LEMON_HAVE_LONG_LONG
 		  // long long
 		  template <typename _Graph, typename _Item>
 		  struct DefaultMapSelector<_Graph, _Item, signed long long> {
 		    typedef VectorMap<_Graph, _Item, signed long long> Map;
 		  };
 		  template <typename _Graph, typename _Item>
 		  struct DefaultMapSelector<_Graph, _Item, unsigned long long> {
 		    typedef VectorMap<_Graph, _Item, unsigned long long> Map;
 		  };

 		#cmakedefine HAVE_LONG_LONG 1
 		 No newline at end of file
 		#cmakedefine LEMON_HAVE_LONG_LONG 1

 		/* Define to 1 if you have CPLEX. */
-		#undef HAVE_CPLEX
+		#undef LEMON_HAVE_CPLEX
 		/* Define to 1 if you have GLPK. */
-		#undef HAVE_GLPK
+		#undef LEMON_HAVE_GLPK
 		/* Define to 1 if you have long long */
-		#undef HAVE_LONG_LONG
+		#undef LEMON_HAVE_LONG_LONG

@@ -52,25 +52,25 @@
 		        return 0;
 		      }'
 		    AC_LANG_PUSH(C++)
 		    AC_LINK_IFELSE([$lx_cplex_test_prog], [lx_cplex_found=yes], [lx_cplex_found=no])
 		    AC_LANG_POP(C++)
 		    CXXFLAGS="$lx_save_cxxflags"
 		    LDFLAGS="$lx_save_ldflags"
 		    LIBS="$lx_save_libs"
 		    if test x"$lx_cplex_found" = x"yes"; then
-		      AC_DEFINE([HAVE_CPLEX], [1], [Define to 1 if you have CPLEX.])
+		      AC_DEFINE([LEMON_HAVE_CPLEX], [1], [Define to 1 if you have CPLEX.])
 		      AC_MSG_RESULT([yes])
 		    else
 		      CPLEX_CFLAGS=""
 		      CPLEX_LDFLAGS=""
 		      CPLEX_LIBS=""
 		      AC_MSG_RESULT([no])
 		    fi
 		  fi
 		  CPLEX_LIBS="$CPLEX_LDFLAGS $CPLEX_LIBS"
 		  AC_SUBST(CPLEX_CFLAGS)
 		  AC_SUBST(CPLEX_LIBS)
 		  AM_CONDITIONAL([HAVE_CPLEX], [test x"$lx_cplex_found" = x"yes"])

@@ -50,25 +50,25 @@
 		        return 0;
 		      }'
 		    AC_LANG_PUSH(C++)
 		    AC_LINK_IFELSE([$lx_glpk_test_prog], [lx_glpk_found=yes], [lx_glpk_found=no])
 		    AC_LANG_POP(C++)
 		    CXXFLAGS="$lx_save_cxxflags"
 		    LDFLAGS="$lx_save_ldflags"
 		    LIBS="$lx_save_libs"
 		    if test x"$lx_glpk_found" = x"yes"; then
-		      AC_DEFINE([HAVE_GLPK], [1], [Define to 1 if you have GLPK.])
+		      AC_DEFINE([LEMON_HAVE_GLPK], [1], [Define to 1 if you have GLPK.])
 		      AC_MSG_RESULT([yes])
 		    else
 		      GLPK_CFLAGS=""
 		      GLPK_LDFLAGS=""
 		      GLPK_LIBS=""
 		      AC_MSG_RESULT([no])
 		    fi
 		  fi
 		  GLPK_LIBS="$GLPK_LDFLAGS $GLPK_LIBS"
 		  AC_SUBST(GLPK_CFLAGS)
 		  AC_SUBST(GLPK_LIBS)
 		  AM_CONDITIONAL([HAVE_GLPK], [test x"$lx_glpk_found" = x"yes"])

@@ -46,25 +46,25 @@
 		        return 0;
 		      }'
 		    AC_LANG_PUSH(C++)
 		    AC_LINK_IFELSE([$lx_soplex_test_prog], [lx_soplex_found=yes], [lx_soplex_found=no])
 		    AC_LANG_POP(C++)
 		    CXXFLAGS="$lx_save_cxxflags"
 		    LDFLAGS="$lx_save_ldflags"
 		    LIBS="$lx_save_libs"
 		    if test x"$lx_soplex_found" = x"yes"; then
-		      AC_DEFINE([HAVE_SOPLEX], [1], [Define to 1 if you have SOPLEX.])
+		      AC_DEFINE([LEMON_HAVE_SOPLEX], [1], [Define to 1 if you have SOPLEX.])
 		      AC_MSG_RESULT([yes])
 		    else
 		      SOPLEX_CXXFLAGS=""
 		      SOPLEX_LDFLAGS=""
 		      SOPLEX_LIBS=""
 		      AC_MSG_RESULT([no])
 		    fi
 		  fi
 		  SOPLEX_LIBS="$SOPLEX_LDFLAGS $SOPLEX_LIBS"
 		  AC_SUBST(SOPLEX_CXXFLAGS)
 		  AC_SUBST(SOPLEX_LIBS)
 		  AM_CONDITIONAL([HAVE_SOPLEX], [test x"$lx_soplex_found" = x"yes"])

-		INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR})
 		INCLUDE_DIRECTORIES(
 		  ${CMAKE_SOURCE_DIR}
 		  ${PROJECT_BINARY_DIR}
+		)
 		LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/lemon)
 		SET(TESTS
 		  bfs_test
 		  counter_test
 		  dfs_test
 		  digraph_test
 		  dijkstra_test
 		  dim_test
 		  error_test
 		  graph_copy_test