gravatar
alpar (Alpar Juttner)
alpar@cs.elte.hu
Merge #432 and #433 to branch 1.1
0 2 0
merge 1.1
0 files changed with 2 insertions and 0 deletions:
↑ Collapse diff ↑
Ignore white space 6 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/template.h \
14 15
	doc/html \
15 16
	doc/CMakeLists.txt
16 17

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

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

	
33 34
DOC_EPS_IMAGES = \
34 35
	$(DOC_EPS_IMAGES18) \
35 36
	$(DOC_EPS_IMAGES27)
36 37

	
37 38
DOC_PNG_IMAGES = \
38 39
	$(DOC_EPS_IMAGES:%.eps=doc/gen-images/%.png)
39 40

	
40 41
EXTRA_DIST += $(DOC_EPS_IMAGES:%=doc/images/%)
41 42

	
42 43
doc/html:
43 44
	$(MAKE) $(AM_MAKEFLAGS) html
44 45

	
45 46
GS_COMMAND=gs -dNOPAUSE -dBATCH -q -dEPSCrop -dTextAlphaBits=4 -dGraphicsAlphaBits=4
46 47

	
47 48
$(DOC_EPS_IMAGES18:%.eps=doc/gen-images/%.png): doc/gen-images/%.png: doc/images/%.eps
48 49
	-mkdir doc/gen-images
49 50
	if test ${gs_found} = yes; then \
50 51
	  $(GS_COMMAND) -sDEVICE=pngalpha -r18 -sOutputFile=$@ $<; \
51 52
	else \
52 53
	  echo; \
53 54
	  echo "Ghostscript not found."; \
54 55
	  echo; \
55 56
	  exit 1; \
56 57
	fi
57 58

	
58 59
$(DOC_EPS_IMAGES27:%.eps=doc/gen-images/%.png): doc/gen-images/%.png: doc/images/%.eps
59 60
	-mkdir doc/gen-images
60 61
	if test ${gs_found} = yes; then \
61 62
	  $(GS_COMMAND) -sDEVICE=pngalpha -r27 -sOutputFile=$@ $<; \
Ignore white space 96 line context
... ...
@@ -12,69 +12,70 @@
12 12
  ${CMAKE_CURRENT_SOURCE_DIR}/lemon.pc.cmake
13 13
  ${CMAKE_CURRENT_BINARY_DIR}/lemon.pc
14 14
  @ONLY
15 15
)
16 16

	
17 17
SET(LEMON_SOURCES
18 18
  arg_parser.cc
19 19
  base.cc
20 20
  color.cc
21 21
  lp_base.cc
22 22
  lp_skeleton.cc
23 23
  random.cc
24 24
  bits/windows.cc
25 25
)
26 26

	
27 27
IF(LEMON_HAVE_GLPK)
28 28
  SET(LEMON_SOURCES ${LEMON_SOURCES} glpk.cc)
29 29
  INCLUDE_DIRECTORIES(${GLPK_INCLUDE_DIRS})
30 30
  IF(WIN32)
31 31
    INSTALL(FILES ${GLPK_BIN_DIR}/glpk.dll DESTINATION bin)
32 32
    INSTALL(FILES ${GLPK_BIN_DIR}/libltdl3.dll DESTINATION bin)
33 33
    INSTALL(FILES ${GLPK_BIN_DIR}/zlib1.dll DESTINATION bin)
34 34
  ENDIF()
35 35
ENDIF()
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)