LEMON/LEMON-official Changeset - r541:4b558ee0d4f5

Repositories » LEMON » LEMON-official

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)

@@ -23,8 +23,10 @@
 		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()

@@ -27,7 +27,7 @@
 		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.

-		INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR})
 		INCLUDE_DIRECTORIES(
 		  ${CMAKE_SOURCE_DIR}
 		  ${PROJECT_BINARY_DIR}
+		)
 		LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/lemon)

-		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
@@ -18,3 +26,8 @@
 		  DESTINATION include/lemon
 		  COMPONENT headers
 		  FILES_MATCHING PATTERN "*.h")
 		INSTALL(
 		  FILES ${CMAKE_CURRENT_BINARY_DIR}/config.h
 		  DESTINATION include/lemon
 		  COMPONENT headers)

@@ -23,6 +23,7 @@
 		        lemon/bin_heap.h \
 		        lemon/color.h \
 			lemon/concept_check.h \
 			lemon/config.h \
 		        lemon/counter.h \
 			lemon/core.h \
 		        lemon/dfs.h \

RhodeCode

@@ -97,7 +97,7 @@
 		  };
-		#if defined HAVE_LONG_LONG
+		#if defined LEMON_HAVE_LONG_LONG
 		  // long long
 		  template <typename _Graph, typename _Item>

 		#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

@@ -61,7 +61,7 @@
 		    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=""

@@ -59,7 +59,7 @@
 		    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=""

@@ -55,7 +55,7 @@
 		    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=""