gravatar
alpar (Alpar Juttner)
alpar@cs.elte.hu
Merge #432 and #433 to branch 1.2
0 2 0
merge 1.2
0 files changed with 3 insertions and 0 deletions:
↑ Collapse diff ↑
Show white space 48 line context
1 1
EXTRA_DIST += \
2 2
	doc/Doxyfile.in \
3 3
	doc/DoxygenLayout.xml \
4 4
	doc/coding_style.dox \
5 5
	doc/dirs.dox \
6 6
	doc/groups.dox \
7 7
	doc/lgf.dox \
8 8
	doc/license.dox \
9 9
	doc/mainpage.dox \
10 10
	doc/migration.dox \
11 11
	doc/min_cost_flow.dox \
12 12
	doc/named-param.dox \
13 13
	doc/namespaces.dox \
14
	doc/references.bib \
15
	doc/template.h \
14 16
	doc/html \
15 17
	doc/CMakeLists.txt
16 18

	
17 19
DOC_EPS_IMAGES18 = \
18 20
	grid_graph.eps \
19 21
	nodeshape_0.eps \
20 22
	nodeshape_1.eps \
21 23
	nodeshape_2.eps \
22 24
	nodeshape_3.eps \
23 25
	nodeshape_4.eps
24 26

	
25 27
DOC_EPS_IMAGES27 = \
26 28
	bipartite_matching.eps \
27 29
	bipartite_partitions.eps \
28 30
	connected_components.eps \
29 31
	edge_biconnected_components.eps \
30 32
	matching.eps \
31 33
	node_biconnected_components.eps \
32 34
	planar.eps \
33 35
	strongly_connected_components.eps
34 36

	
35 37
DOC_EPS_IMAGES = \
36 38
	$(DOC_EPS_IMAGES18) \
37 39
	$(DOC_EPS_IMAGES27)
Show white space 48 line context
... ...
@@ -36,45 +36,46 @@
36 36

	
37 37
IF(LEMON_HAVE_CPLEX)
38 38
  SET(LEMON_SOURCES ${LEMON_SOURCES} cplex.cc)
39 39
  INCLUDE_DIRECTORIES(${CPLEX_INCLUDE_DIRS})
40 40
ENDIF()
41 41

	
42 42
IF(LEMON_HAVE_CLP)
43 43
  SET(LEMON_SOURCES ${LEMON_SOURCES} clp.cc)
44 44
  INCLUDE_DIRECTORIES(${COIN_INCLUDE_DIRS})
45 45
ENDIF()
46 46

	
47 47
IF(LEMON_HAVE_CBC)
48 48
  SET(LEMON_SOURCES ${LEMON_SOURCES} cbc.cc)
49 49
  INCLUDE_DIRECTORIES(${COIN_INCLUDE_DIRS})
50 50
ENDIF()
51 51

	
52 52
ADD_LIBRARY(lemon ${LEMON_SOURCES})
53 53
IF(UNIX)
54 54
  SET_TARGET_PROPERTIES(lemon PROPERTIES OUTPUT_NAME emon)
55 55
ENDIF()
56 56

	
57 57
INSTALL(
58 58
  TARGETS lemon
59 59
  ARCHIVE DESTINATION lib
60
  LIBRARY DESTINATION lib
60 61
  COMPONENT library
61 62
)
62 63

	
63 64
INSTALL(
64 65
  DIRECTORY . bits concepts
65 66
  DESTINATION include/lemon
66 67
  COMPONENT headers
67 68
  FILES_MATCHING PATTERN "*.h"
68 69
)
69 70

	
70 71
INSTALL(
71 72
  FILES ${CMAKE_CURRENT_BINARY_DIR}/config.h
72 73
  DESTINATION include/lemon
73 74
  COMPONENT headers
74 75
)
75 76

	
76 77
INSTALL(
77 78
  FILES ${CMAKE_CURRENT_BINARY_DIR}/lemon.pc
78 79
  DESTINATION lib/pkgconfig
79 80
)
80 81

	
0 comments (0 inline)