1.1 --- a/CMakeLists.txt Tue Mar 31 16:21:30 2009 +0100
1.2 +++ b/CMakeLists.txt Tue Apr 28 13:42:28 2009 +0100
1.3 @@ -23,8 +23,10 @@
1.4 INCLUDE(FindDoxygen)
1.5 INCLUDE(FindGhostscript)
1.6
1.7 +ADD_DEFINITIONS(-DHAVE_CONFIG_H)
1.8 +
1.9 INCLUDE(CheckTypeSize)
1.10 -CHECK_TYPE_SIZE("long long" LONG_LONG)
1.11 +CHECK_TYPE_SIZE("long long" LEMON_LONG_LONG)
1.12
1.13 ENABLE_TESTING()
1.14
2.1 --- a/configure.ac Tue Mar 31 16:21:30 2009 +0100
2.2 +++ b/configure.ac Tue Apr 28 13:42:28 2009 +0100
2.3 @@ -27,7 +27,7 @@
2.4 dnl Check the existence of long long type.
2.5 AC_CHECK_TYPE(long long, [long_long_found=yes], [long_long_found=no])
2.6 if test x"$long_long_found" = x"yes"; then
2.7 - AC_DEFINE([HAVE_LONG_LONG], [1], [Define to 1 if you have long long.])
2.8 + AC_DEFINE([LEMON_HAVE_LONG_LONG], [1], [Define to 1 if you have long long.])
2.9 fi
2.10
2.11 dnl Checks for programs.
3.1 --- a/demo/CMakeLists.txt Tue Mar 31 16:21:30 2009 +0100
3.2 +++ b/demo/CMakeLists.txt Tue Apr 28 13:42:28 2009 +0100
3.3 @@ -1,4 +1,7 @@
3.4 -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR})
3.5 +INCLUDE_DIRECTORIES(
3.6 + ${CMAKE_SOURCE_DIR}
3.7 + ${PROJECT_BINARY_DIR}
3.8 +)
3.9
3.10 LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/lemon)
3.11
4.1 --- a/lemon/CMakeLists.txt Tue Mar 31 16:21:30 2009 +0100
4.2 +++ b/lemon/CMakeLists.txt Tue Apr 28 13:42:28 2009 +0100
4.3 @@ -1,4 +1,12 @@
4.4 -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR})
4.5 +INCLUDE_DIRECTORIES(
4.6 + ${CMAKE_SOURCE_DIR}
4.7 + ${PROJECT_BINARY_DIR}
4.8 +)
4.9 +
4.10 +CONFIGURE_FILE(
4.11 + ${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake
4.12 + ${CMAKE_CURRENT_BINARY_DIR}/config.h
4.13 +)
4.14
4.15 ADD_LIBRARY(lemon
4.16 arg_parser.cc
4.17 @@ -18,3 +26,8 @@
4.18 DESTINATION include/lemon
4.19 COMPONENT headers
4.20 FILES_MATCHING PATTERN "*.h")
4.21 +
4.22 +INSTALL(
4.23 + FILES ${CMAKE_CURRENT_BINARY_DIR}/config.h
4.24 + DESTINATION include/lemon
4.25 + COMPONENT headers)
5.1 --- a/lemon/Makefile.am Tue Mar 31 16:21:30 2009 +0100
5.2 +++ b/lemon/Makefile.am Tue Apr 28 13:42:28 2009 +0100
5.3 @@ -23,6 +23,7 @@
5.4 lemon/bin_heap.h \
5.5 lemon/color.h \
5.6 lemon/concept_check.h \
5.7 + lemon/config.h \
5.8 lemon/counter.h \
5.9 lemon/core.h \
5.10 lemon/dfs.h \
6.1 --- a/lemon/bits/default_map.h Tue Mar 31 16:21:30 2009 +0100
6.2 +++ b/lemon/bits/default_map.h Tue Apr 28 13:42:28 2009 +0100
6.3 @@ -97,7 +97,7 @@
6.4 };
6.5
6.6
6.7 -#if defined HAVE_LONG_LONG
6.8 +#if defined LEMON_HAVE_LONG_LONG
6.9
6.10 // long long
6.11 template <typename _Graph, typename _Item>
7.1 --- a/lemon/config.h.cmake Tue Mar 31 16:21:30 2009 +0100
7.2 +++ b/lemon/config.h.cmake Tue Apr 28 13:42:28 2009 +0100
7.3 @@ -1,1 +1,1 @@
7.4 -#cmakedefine HAVE_LONG_LONG 1
7.5 \ No newline at end of file
7.6 +#cmakedefine LEMON_HAVE_LONG_LONG 1
8.1 --- a/lemon/config.h.in Tue Mar 31 16:21:30 2009 +0100
8.2 +++ b/lemon/config.h.in Tue Apr 28 13:42:28 2009 +0100
8.3 @@ -1,8 +1,8 @@
8.4 /* Define to 1 if you have CPLEX. */
8.5 -#undef HAVE_CPLEX
8.6 +#undef LEMON_HAVE_CPLEX
8.7
8.8 /* Define to 1 if you have GLPK. */
8.9 -#undef HAVE_GLPK
8.10 +#undef LEMON_HAVE_GLPK
8.11
8.12 /* Define to 1 if you have long long */
8.13 -#undef HAVE_LONG_LONG
8.14 +#undef LEMON_HAVE_LONG_LONG
9.1 --- a/m4/lx_check_cplex.m4 Tue Mar 31 16:21:30 2009 +0100
9.2 +++ b/m4/lx_check_cplex.m4 Tue Apr 28 13:42:28 2009 +0100
9.3 @@ -61,7 +61,7 @@
9.4 LIBS="$lx_save_libs"
9.5
9.6 if test x"$lx_cplex_found" = x"yes"; then
9.7 - AC_DEFINE([HAVE_CPLEX], [1], [Define to 1 if you have CPLEX.])
9.8 + AC_DEFINE([LEMON_HAVE_CPLEX], [1], [Define to 1 if you have CPLEX.])
9.9 AC_MSG_RESULT([yes])
9.10 else
9.11 CPLEX_CFLAGS=""
10.1 --- a/m4/lx_check_glpk.m4 Tue Mar 31 16:21:30 2009 +0100
10.2 +++ b/m4/lx_check_glpk.m4 Tue Apr 28 13:42:28 2009 +0100
10.3 @@ -59,7 +59,7 @@
10.4 LIBS="$lx_save_libs"
10.5
10.6 if test x"$lx_glpk_found" = x"yes"; then
10.7 - AC_DEFINE([HAVE_GLPK], [1], [Define to 1 if you have GLPK.])
10.8 + AC_DEFINE([LEMON_HAVE_GLPK], [1], [Define to 1 if you have GLPK.])
10.9 AC_MSG_RESULT([yes])
10.10 else
10.11 GLPK_CFLAGS=""
11.1 --- a/m4/lx_check_soplex.m4 Tue Mar 31 16:21:30 2009 +0100
11.2 +++ b/m4/lx_check_soplex.m4 Tue Apr 28 13:42:28 2009 +0100
11.3 @@ -55,7 +55,7 @@
11.4 LIBS="$lx_save_libs"
11.5
11.6 if test x"$lx_soplex_found" = x"yes"; then
11.7 - AC_DEFINE([HAVE_SOPLEX], [1], [Define to 1 if you have SOPLEX.])
11.8 + AC_DEFINE([LEMON_HAVE_SOPLEX], [1], [Define to 1 if you have SOPLEX.])
11.9 AC_MSG_RESULT([yes])
11.10 else
11.11 SOPLEX_CXXFLAGS=""
12.1 --- a/test/CMakeLists.txt Tue Mar 31 16:21:30 2009 +0100
12.2 +++ b/test/CMakeLists.txt Tue Apr 28 13:42:28 2009 +0100
12.3 @@ -1,4 +1,7 @@
12.4 -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR})
12.5 +INCLUDE_DIRECTORIES(
12.6 + ${CMAKE_SOURCE_DIR}
12.7 + ${PROJECT_BINARY_DIR}
12.8 +)
12.9
12.10 LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/lemon)
12.11