gravatar
alpar (Alpar Juttner)
alpar@cs.elte.hu
Merge CMAKE and Doxygen backports to branch 1.1
0 5 1
merge 1.1
0 files changed with 144 insertions and 9 deletions:
↑ Collapse diff ↑
Show white space 12 line context
1
prefix=@CMAKE_INSTALL_PREFIX@
2
exec_prefix=@CMAKE_INSTALL_PREFIX@/bin
3
libdir=@CMAKE_INSTALL_PREFIX@/lib
4
includedir=@CMAKE_INSTALL_PREFIX@/include
5

	
6
Name: @PROJECT_NAME@
7
Description: Library for Efficient Modeling and Optimization in Networks
8
Version: @PROJECT_VERSION@
9
Libs: -L${libdir} -lemon @GLPK_LIBS@ @CPLEX_LIBS@ @SOPLEX_LIBS@ @CLP_LIBS@ @CBC_LIBS@
10
Cflags: -I${includedir}
Show white space 12 line context
1 1
CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
2 2

	
3 3
SET(PROJECT_NAME "LEMON")
4 4
PROJECT(${PROJECT_NAME})
5 5

	
6
INCLUDE(FindPythonInterp)
7
INCLUDE(FindWget)
8

	
6 9
IF(EXISTS ${PROJECT_SOURCE_DIR}/cmake/version.cmake)
7 10
  INCLUDE(${PROJECT_SOURCE_DIR}/cmake/version.cmake)
8 11
ELSEIF(DEFINED ENV{LEMON_VERSION})
9 12
  SET(LEMON_VERSION $ENV{LEMON_VERSION} CACHE STRING "LEMON version string.")
10 13
ELSE()
11 14
  EXECUTE_PROCESS(
15
    COMMAND ${PYTHON_EXECUTABLE} ./scripts/chg-len.py
16
    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
17
    OUTPUT_VARIABLE HG_REVISION_PATH
18
    ERROR_QUIET
19
    OUTPUT_STRIP_TRAILING_WHITESPACE
20
  )
21
  EXECUTE_PROCESS(
12 22
    COMMAND hg id -i
13 23
    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
14 24
    OUTPUT_VARIABLE HG_REVISION
15 25
    ERROR_QUIET
16 26
    OUTPUT_STRIP_TRAILING_WHITESPACE
17 27
  )
18 28
  IF(HG_REVISION STREQUAL "")
19
    SET(HG_REVISION "hg-tip")
29
    SET(HG_REVISION_ID "hg-tip")
30
  ELSE()
31
    IF(HG_REVISION_PATH STREQUAL "")
32
      SET(HG_REVISION_ID ${HG_REVISION})
33
    ELSE()
34
      SET(HG_REVISION_ID ${HG_REVISION_PATH}.${HG_REVISION})
20 35
  ENDIF()
21
  SET(LEMON_VERSION ${HG_REVISION} CACHE STRING "LEMON version string.")
36
  ENDIF()
37
  SET(LEMON_VERSION ${HG_REVISION_ID} CACHE STRING "LEMON version string.")
22 38
ENDIF()
23 39

	
24 40
SET(PROJECT_VERSION ${LEMON_VERSION})
25 41

	
26 42
SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
27 43

	
28 44
FIND_PACKAGE(Doxygen)
29 45
FIND_PACKAGE(Ghostscript)
30 46
FIND_PACKAGE(GLPK 4.33)
31 47
FIND_PACKAGE(CPLEX)
32 48
FIND_PACKAGE(COIN)
33 49

	
50
IF(DEFINED ENV{LEMON_CXX_WARNING})
51
  SET(CXX_WARNING $ENV{LEMON_CXX_WARNING})
52
ELSE()
53
  IF(CMAKE_COMPILER_IS_GNUCXX)
54
    SET(CXX_WARNING "-Wall -W -Wunused -Wformat=2 -Wctor-dtor-privacy -Wnon-virtual-dtor -Wno-char-subscripts -Wwrite-strings -Wno-char-subscripts -Wreturn-type -Wcast-qual -Wcast-align -Wsign-promo -Woverloaded-virtual -ansi -fno-strict-aliasing -Wold-style-cast -Wno-unknown-pragmas")
55
    SET(CMAKE_CXX_FLAGS_DEBUG CACHE STRING "-ggdb")
56
    SET(CMAKE_C_FLAGS_DEBUG CACHE STRING "-ggdb")
57
  ELSEIF(MSVC)
58
    # This part is unnecessary 'casue the same is set by the lemon/core.h.
59
    # Still keep it as an example.
60
    SET(CXX_WARNING "/wd4250 /wd4355 /wd4503 /wd4800 /wd4996")
61
    # Suppressed warnings:
62
    # C4250: 'class1' : inherits 'class2::member' via dominance
63
    # C4355: 'this' : used in base member initializer list
64
    # C4503: 'function' : decorated name length exceeded, name was truncated
65
    # C4800: 'type' : forcing value to bool 'true' or 'false'
66
    #        (performance warning)
67
    # C4996: 'function': was declared deprecated
68
  ELSE()
69
    SET(CXX_WARNING "-Wall -W")
70
  ENDIF()
71
ENDIF()
72
SET(LEMON_CXX_WARNING_FLAGS ${CXX_WARNING} CACHE STRING "LEMON warning flags.")
73

	
74
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${LEMON_CXX_WARNING_FLAGS}")
75

	
76
SET( CMAKE_CXX_FLAGS_MAINTAINER "-Werror -ggdb" CACHE STRING
77
    "Flags used by the C++ compiler during maintainer builds."
78
    FORCE )
79
SET( CMAKE_C_FLAGS_MAINTAINER "-Werror" CACHE STRING
80
    "Flags used by the C compiler during maintainer builds."
81
    FORCE )
82
SET( CMAKE_EXE_LINKER_FLAGS_MAINTAINER
83
    "-Wl,--warn-unresolved-symbols,--warn-once" CACHE STRING
84
    "Flags used for linking binaries during maintainer builds."
85
    FORCE )
86
SET( CMAKE_SHARED_LINKER_FLAGS_MAINTAINER
87
    "-Wl,--warn-unresolved-symbols,--warn-once" CACHE STRING
88
    "Flags used by the shared libraries linker during maintainer builds."
89
    FORCE )
90
MARK_AS_ADVANCED(
91
    CMAKE_CXX_FLAGS_MAINTAINER
92
    CMAKE_C_FLAGS_MAINTAINER
93
    CMAKE_EXE_LINKER_FLAGS_MAINTAINER
94
    CMAKE_SHARED_LINKER_FLAGS_MAINTAINER )
95

	
96
IF(CMAKE_CONFIGURATION_TYPES)
97
  LIST(APPEND CMAKE_CONFIGURATION_TYPES Maintainer)
98
  LIST(REMOVE_DUPLICATES CMAKE_CONFIGURATION_TYPES)
99
  SET(CMAKE_CONFIGURATION_TYPES "${CMAKE_CONFIGURATION_TYPES}" CACHE STRING
100
      "Add the configurations that we need"
101
      FORCE)
102
 endif()
103

	
104
IF(NOT CMAKE_BUILD_TYPE)
105
  SET(CMAKE_BUILD_TYPE "Release")
106
ENDIF()
107

	
108
SET( CMAKE_BUILD_TYPE "${CMAKE_BUILD_TYPE}" CACHE STRING
109
    "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel Maintainer."
110
    FORCE )
111

	
112

	
34 113
INCLUDE(CheckTypeSize)
35 114
CHECK_TYPE_SIZE("long long" LONG_LONG)
36 115
SET(LEMON_HAVE_LONG_LONG ${HAVE_LONG_LONG})
37 116

	
38 117
ENABLE_TESTING()
39 118

	
119
IF(${CMAKE_BUILD_TYPE} STREQUAL "Maintainer")
120
  ADD_CUSTOM_TARGET(check ALL COMMAND ${CMAKE_CTEST_COMMAND})
121
ELSE()
122
  ADD_CUSTOM_TARGET(check COMMAND ${CMAKE_CTEST_COMMAND})
123
ENDIF()
124

	
40 125
ADD_SUBDIRECTORY(lemon)
41 126
IF(${CMAKE_SOURCE_DIR} STREQUAL ${PROJECT_SOURCE_DIR})
42 127
  ADD_SUBDIRECTORY(demo)
43 128
  ADD_SUBDIRECTORY(tools)
44 129
  ADD_SUBDIRECTORY(doc)
45 130
  ADD_SUBDIRECTORY(test)
... ...
@@ -59,13 +144,13 @@
59 144
  INSTALL(
60 145
    FILES ${PROJECT_BINARY_DIR}/cmake/LEMONConfig.cmake
61 146
    DESTINATION cmake
62 147
  )
63 148
ENDIF()
64 149

	
65
IF(${CMAKE_SOURCE_DIR} STREQUAL ${PROJECT_SOURCE_DIR} AND WIN32)
150
IF(${CMAKE_SOURCE_DIR} STREQUAL ${PROJECT_SOURCE_DIR})
66 151
  SET(CPACK_PACKAGE_NAME ${PROJECT_NAME})
67 152
  SET(CPACK_PACKAGE_VENDOR "EGRES")
68 153
  SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY
69 154
    "LEMON - Library for Efficient Modeling and Optimization in Networks")
70 155
  SET(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
71 156

	
Show white space 12 line context
1 1
SET(PACKAGE_NAME ${PROJECT_NAME})
2 2
SET(PACKAGE_VERSION ${PROJECT_VERSION})
3 3
SET(abs_top_srcdir ${PROJECT_SOURCE_DIR})
4 4
SET(abs_top_builddir ${PROJECT_BINARY_DIR})
5 5

	
6
SET(LEMON_DOC_SOURCE_BROWSER "NO" CACHE STRING "Include source into the doc (YES/NO).")
7

	
6 8
CONFIGURE_FILE(
7 9
  ${PROJECT_SOURCE_DIR}/doc/Doxyfile.in
8 10
  ${PROJECT_BINARY_DIR}/doc/Doxyfile
9 11
  @ONLY
10 12
)
11 13

	
... ...
@@ -46,6 +48,18 @@
46 48
      DESTINATION doc
47 49
      COMPONENT html_documentation
48 50
    )
49 51
  ENDIF()
50 52

	
51 53
ENDIF()
54

	
55
IF(WGET_FOUND)
56
ADD_CUSTOM_TARGET(update-external-tags
57
  COMMAND ${CMAKE_COMMAND} -E make_directory dl
58
  # COMMAND ${CMAKE_COMMAND} -E copy libstdc++.tag dl
59
  COMMAND ${WGET_EXECUTABLE} wget -P dl -N libstdc++.tag.tmp http://gcc.gnu.org/onlinedocs/libstdc++/latest-doxygen/libstdc++.tag
60
  COMMAND ${CMAKE_COMMAND} -E rename dl/libstdc++.tag libstdc++.tag
61
  COMMAND ${CMAKE_COMMAND} -E remove dl/libstdc++.tag
62
  COMMAND ${CMAKE_COMMAND} -E remove_directory dl
63
  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
64
  )
65
ENDIF()
Show white space 12 line context
1
# Doxyfile 1.5.7.1
1
# Doxyfile 1.5.9
2 2

	
3 3
#---------------------------------------------------------------------------
4 4
# Project related configuration options
5 5
#---------------------------------------------------------------------------
6 6
DOXYFILE_ENCODING      = UTF-8
7 7
PROJECT_NAME           = @PACKAGE_NAME@
... ...
@@ -18,13 +18,12 @@
18 18
STRIP_FROM_PATH        = "@abs_top_srcdir@"
19 19
STRIP_FROM_INC_PATH    = "@abs_top_srcdir@"
20 20
SHORT_NAMES            = YES
21 21
JAVADOC_AUTOBRIEF      = NO
22 22
QT_AUTOBRIEF           = NO
23 23
MULTILINE_CPP_IS_BRIEF = NO
24
DETAILS_AT_TOP         = YES
25 24
INHERIT_DOCS           = NO
26 25
SEPARATE_MEMBER_PAGES  = NO
27 26
TAB_SIZE               = 8
28 27
ALIASES                = 
29 28
OPTIMIZE_OUTPUT_FOR_C  = NO
30 29
OPTIMIZE_OUTPUT_JAVA   = NO
... ...
@@ -68,13 +67,13 @@
68 67
MAX_INITIALIZER_LINES  = 5
69 68
SHOW_USED_FILES        = NO
70 69
SHOW_DIRECTORIES       = YES
71 70
SHOW_FILES             = YES
72 71
SHOW_NAMESPACES        = YES
73 72
FILE_VERSION_FILTER    = 
74
LAYOUT_FILE            = DoxygenLayout.xml
73
LAYOUT_FILE            = "@abs_top_srcdir@/doc/DoxygenLayout.xml"
75 74
#---------------------------------------------------------------------------
76 75
# configuration options related to warning and progress messages
77 76
#---------------------------------------------------------------------------
78 77
QUIET                  = NO
79 78
WARNINGS               = YES
80 79
WARN_IF_UNDOCUMENTED   = YES
... ...
@@ -111,13 +110,13 @@
111 110
INPUT_FILTER           = 
112 111
FILTER_PATTERNS        = 
113 112
FILTER_SOURCE_FILES    = NO
114 113
#---------------------------------------------------------------------------
115 114
# configuration options related to source browsing
116 115
#---------------------------------------------------------------------------
117
SOURCE_BROWSER         = NO
116
SOURCE_BROWSER         = @LEMON_DOC_SOURCE_BROWSER@
118 117
INLINE_SOURCES         = NO
119 118
STRIP_CODE_COMMENTS    = YES
120 119
REFERENCED_BY_RELATION = NO
121 120
REFERENCES_RELATION    = NO
122 121
REFERENCES_LINK_SOURCE = YES
123 122
USE_HTAGS              = NO
... ...
@@ -220,15 +219,15 @@
220 219
INCLUDE_PATH           = 
221 220
INCLUDE_FILE_PATTERNS  = 
222 221
PREDEFINED             = DOXYGEN
223 222
EXPAND_AS_DEFINED      = 
224 223
SKIP_FUNCTION_MACROS   = YES
225 224
#---------------------------------------------------------------------------
226
# Configuration::additions related to external references   
225
# Options related to the search engine   
227 226
#---------------------------------------------------------------------------
228
TAGFILES               = "@abs_top_srcdir@/doc/libstdc++.tag = http://gcc.gnu.org/onlinedocs/libstdc++/latest-doxygen/  "
227
TAGFILES               = "@abs_top_builddir@/doc/libstdc++.tag = http://gcc.gnu.org/onlinedocs/libstdc++/latest-doxygen/  "
229 228
GENERATE_TAGFILE       = html/lemon.tag
230 229
ALLEXTERNALS           = NO
231 230
EXTERNAL_GROUPS        = NO
232 231
PERL_PATH              = /usr/bin/perl
233 232
#---------------------------------------------------------------------------
234 233
# Configuration options related to the dot tool   
Show white space 12 line context
... ...
@@ -5,12 +5,18 @@
5 5

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

	
11
CONFIGURE_FILE(
12
  ${CMAKE_CURRENT_SOURCE_DIR}/lemon.pc.cmake
13
  ${CMAKE_CURRENT_BINARY_DIR}/lemon.pc
14
  @ONLY
15
)
16

	
11 17
SET(LEMON_SOURCES
12 18
  arg_parser.cc
13 19
  base.cc
14 20
  color.cc
15 21
  lp_base.cc
16 22
  lp_skeleton.cc
... ...
@@ -63,6 +69,12 @@
63 69

	
64 70
INSTALL(
65 71
  FILES ${CMAKE_CURRENT_BINARY_DIR}/config.h
66 72
  DESTINATION include/lemon
67 73
  COMPONENT headers
68 74
)
75

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

	
Show white space 12 line context
... ...
@@ -38,13 +38,18 @@
38 38
  suurballe_test
39 39
  time_measure_test
40 40
  unionfind_test
41 41
)
42 42

	
43 43
IF(LEMON_HAVE_LP)
44
  IF(${CMAKE_BUILD_TYPE} STREQUAL "Maintainer")
44 45
  ADD_EXECUTABLE(lp_test lp_test.cc)
46
  ELSE()
47
    ADD_EXECUTABLE(lp_test EXCLUDE_FROM_ALL lp_test.cc)
48
  ENDIF()
49

	
45 50
  SET(LP_TEST_LIBS lemon)
46 51

	
47 52
  IF(LEMON_HAVE_GLPK)
48 53
    SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${GLPK_LIBRARIES})
49 54
  ENDIF()
50 55
  IF(LEMON_HAVE_CPLEX)
... ...
@@ -74,13 +79,18 @@
74 79
      COMMAND ${CMAKE_COMMAND} -E copy ${CPLEX_BIN_DIR}/cplex91.dll ${TARGET_PATH}
75 80
    )
76 81
  ENDIF()
77 82
ENDIF()
78 83

	
79 84
IF(LEMON_HAVE_MIP)
85
  IF(${CMAKE_BUILD_TYPE} STREQUAL "Maintainer")
80 86
  ADD_EXECUTABLE(mip_test mip_test.cc)
87
  ELSE()
88
    ADD_EXECUTABLE(mip_test EXCLUDE_FROM_ALL mip_test.cc)
89
  ENDIF()
90

	
81 91
  SET(MIP_TEST_LIBS lemon)
82 92

	
83 93
  IF(LEMON_HAVE_GLPK)
84 94
    SET(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${GLPK_LIBRARIES})
85 95
  ENDIF()
86 96
  IF(LEMON_HAVE_CPLEX)
... ...
@@ -110,10 +120,15 @@
110 120
      COMMAND ${CMAKE_COMMAND} -E copy ${CPLEX_BIN_DIR}/cplex91.dll ${TARGET_PATH}
111 121
    )
112 122
  ENDIF()
113 123
ENDIF()
114 124

	
115 125
FOREACH(TEST_NAME ${TESTS})
126
  IF(${CMAKE_BUILD_TYPE} STREQUAL "Maintainer")
116 127
  ADD_EXECUTABLE(${TEST_NAME} ${TEST_NAME}.cc)
128
  ELSE()
129
    ADD_EXECUTABLE(${TEST_NAME} EXCLUDE_FROM_ALL ${TEST_NAME}.cc)
130
  ENDIF()
117 131
  TARGET_LINK_LIBRARIES(${TEST_NAME} lemon)
118 132
  ADD_TEST(${TEST_NAME} ${TEST_NAME})
133
  ADD_DEPENDENCIES(check ${TEST_NAME})
119 134
ENDFOREACH()
0 comments (0 inline)