↑ Collapse diff ↑
Ignore white space 6 line context
... ...
@@ -20,14 +20,16 @@
20 20
# C4996: 'function': was declared deprecated
21 21
ENDIF(MSVC)
22 22

	
23 23
INCLUDE(FindDoxygen)
24 24
INCLUDE(FindGhostscript)
25 25

	
26
ADD_DEFINITIONS(-DHAVE_CONFIG_H)
27

	
26 28
INCLUDE(CheckTypeSize)
27
CHECK_TYPE_SIZE("long long" LONG_LONG)
29
CHECK_TYPE_SIZE("long long" LEMON_LONG_LONG)
28 30

	
29 31
ENABLE_TESTING()
30 32

	
31 33
ADD_SUBDIRECTORY(lemon)
32 34
ADD_SUBDIRECTORY(demo)
33 35
ADD_SUBDIRECTORY(doc)
Ignore white space 6 line context
... ...
@@ -24,13 +24,13 @@
24 24
dnl Do compilation tests using the C++ compiler.
25 25
AC_LANG([C++])
26 26

	
27 27
dnl Check the existence of long long type.
28 28
AC_CHECK_TYPE(long long, [long_long_found=yes], [long_long_found=no])
29 29
if test x"$long_long_found" = x"yes"; then
30
  AC_DEFINE([HAVE_LONG_LONG], [1], [Define to 1 if you have long long.])
30
  AC_DEFINE([LEMON_HAVE_LONG_LONG], [1], [Define to 1 if you have long long.])
31 31
fi
32 32

	
33 33
dnl Checks for programs.
34 34
AC_PROG_CXX
35 35
AC_PROG_CXXCPP
36 36
AC_PROG_INSTALL
Ignore white space 6 line context
1
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR})
1
INCLUDE_DIRECTORIES(
2
  ${CMAKE_SOURCE_DIR}
3
  ${PROJECT_BINARY_DIR}
4
)
2 5

	
3 6
LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/lemon)
4 7

	
5 8
SET(DEMOS
6 9
  arg_parser_demo
7 10
  graph_to_eps_demo
Ignore white space 6 line context
1
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR})
1
INCLUDE_DIRECTORIES(
2
  ${CMAKE_SOURCE_DIR}
3
  ${PROJECT_BINARY_DIR}
4
)
5

	
6
CONFIGURE_FILE(
7
  ${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake
8
  ${CMAKE_CURRENT_BINARY_DIR}/config.h
9
)
2 10

	
3 11
ADD_LIBRARY(lemon
4 12
  arg_parser.cc
5 13
  base.cc
6 14
  color.cc
7 15
  random.cc
... ...
@@ -15,6 +23,11 @@
15 23

	
16 24
INSTALL(
17 25
  DIRECTORY . bits concepts
18 26
  DESTINATION include/lemon
19 27
  COMPONENT headers
20 28
  FILES_MATCHING PATTERN "*.h")
29

	
30
INSTALL(
31
  FILES ${CMAKE_CURRENT_BINARY_DIR}/config.h
32
  DESTINATION include/lemon
33
  COMPONENT headers)
Ignore white space 6 line context
... ...
@@ -20,12 +20,13 @@
20 20
        lemon/arg_parser.h \
21 21
	lemon/assert.h \
22 22
        lemon/bfs.h \
23 23
        lemon/bin_heap.h \
24 24
        lemon/color.h \
25 25
	lemon/concept_check.h \
26
	lemon/config.h \
26 27
        lemon/counter.h \
27 28
	lemon/core.h \
28 29
        lemon/dfs.h \
29 30
        lemon/dijkstra.h \
30 31
        lemon/dim2.h \
31 32
	lemon/error.h \
Ignore white space 6 line context
... ...
@@ -94,13 +94,13 @@
94 94
  template <typename _Graph, typename _Item>
95 95
  struct DefaultMapSelector<_Graph, _Item, unsigned long> {
96 96
    typedef VectorMap<_Graph, _Item, unsigned long> Map;
97 97
  };
98 98

	
99 99

	
100
#if defined HAVE_LONG_LONG
100
#if defined LEMON_HAVE_LONG_LONG
101 101

	
102 102
  // long long
103 103
  template <typename _Graph, typename _Item>
104 104
  struct DefaultMapSelector<_Graph, _Item, signed long long> {
105 105
    typedef VectorMap<_Graph, _Item, signed long long> Map;
106 106
  };
Ignore white space 12 line context
1
#cmakedefine HAVE_LONG_LONG 1
... ...
 No newline at end of file
1
#cmakedefine LEMON_HAVE_LONG_LONG 1
Ignore white space 6 line context
1 1
/* Define to 1 if you have CPLEX. */
2
#undef HAVE_CPLEX
2
#undef LEMON_HAVE_CPLEX
3 3

	
4 4
/* Define to 1 if you have GLPK. */
5
#undef HAVE_GLPK
5
#undef LEMON_HAVE_GLPK
6 6

	
7 7
/* Define to 1 if you have long long */
8
#undef HAVE_LONG_LONG
8
#undef LEMON_HAVE_LONG_LONG
Ignore white space 6 line context
... ...
@@ -58,13 +58,13 @@
58 58

	
59 59
    CXXFLAGS="$lx_save_cxxflags"
60 60
    LDFLAGS="$lx_save_ldflags"
61 61
    LIBS="$lx_save_libs"
62 62

	
63 63
    if test x"$lx_cplex_found" = x"yes"; then
64
      AC_DEFINE([HAVE_CPLEX], [1], [Define to 1 if you have CPLEX.])
64
      AC_DEFINE([LEMON_HAVE_CPLEX], [1], [Define to 1 if you have CPLEX.])
65 65
      AC_MSG_RESULT([yes])
66 66
    else
67 67
      CPLEX_CFLAGS=""
68 68
      CPLEX_LDFLAGS=""
69 69
      CPLEX_LIBS=""
70 70
      AC_MSG_RESULT([no])
Ignore white space 6 line context
... ...
@@ -56,13 +56,13 @@
56 56

	
57 57
    CXXFLAGS="$lx_save_cxxflags"
58 58
    LDFLAGS="$lx_save_ldflags"
59 59
    LIBS="$lx_save_libs"
60 60

	
61 61
    if test x"$lx_glpk_found" = x"yes"; then
62
      AC_DEFINE([HAVE_GLPK], [1], [Define to 1 if you have GLPK.])
62
      AC_DEFINE([LEMON_HAVE_GLPK], [1], [Define to 1 if you have GLPK.])
63 63
      AC_MSG_RESULT([yes])
64 64
    else
65 65
      GLPK_CFLAGS=""
66 66
      GLPK_LDFLAGS=""
67 67
      GLPK_LIBS=""
68 68
      AC_MSG_RESULT([no])
Ignore white space 6 line context
... ...
@@ -52,13 +52,13 @@
52 52

	
53 53
    CXXFLAGS="$lx_save_cxxflags"
54 54
    LDFLAGS="$lx_save_ldflags"
55 55
    LIBS="$lx_save_libs"
56 56

	
57 57
    if test x"$lx_soplex_found" = x"yes"; then
58
      AC_DEFINE([HAVE_SOPLEX], [1], [Define to 1 if you have SOPLEX.])
58
      AC_DEFINE([LEMON_HAVE_SOPLEX], [1], [Define to 1 if you have SOPLEX.])
59 59
      AC_MSG_RESULT([yes])
60 60
    else
61 61
      SOPLEX_CXXFLAGS=""
62 62
      SOPLEX_LDFLAGS=""
63 63
      SOPLEX_LIBS=""
64 64
      AC_MSG_RESULT([no])
Ignore white space 6 line context
1
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR})
1
INCLUDE_DIRECTORIES(
2
  ${CMAKE_SOURCE_DIR}
3
  ${PROJECT_BINARY_DIR}
4
)
2 5

	
3 6
LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/lemon)
4 7

	
5 8
SET(TESTS
6 9
  bfs_test
7 10
  counter_test
0 comments (0 inline)