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 147 insertions and 12 deletions:
↑ Collapse diff ↑
Ignore white space 6 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}
Ignore white space 6 line context
... ...
@@ -5,2 +5,5 @@
5 5

	
6
INCLUDE(FindPythonInterp)
7
INCLUDE(FindWget)
8

	
6 9
IF(EXISTS ${PROJECT_SOURCE_DIR}/cmake/version.cmake)
... ...
@@ -11,2 +14,9 @@
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
... ...
@@ -18,5 +28,11 @@
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})
35
    ENDIF()
20 36
  ENDIF()
21
  SET(LEMON_VERSION ${HG_REVISION} CACHE STRING "LEMON version string.")
37
  SET(LEMON_VERSION ${HG_REVISION_ID} CACHE STRING "LEMON version string.")
22 38
ENDIF()
... ...
@@ -33,2 +49,65 @@
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)
... ...
@@ -39,2 +118,8 @@
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)
... ...
@@ -64,3 +149,3 @@
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})
Show white space 6 line context
... ...
@@ -5,2 +5,4 @@
5 5

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

	
6 8
CONFIGURE_FILE(
... ...
@@ -51,1 +53,13 @@
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()
Ignore white space 6 line context
1
# Doxyfile 1.5.7.1
1
# Doxyfile 1.5.9
2 2

	
... ...
@@ -23,3 +23,2 @@
23 23
MULTILINE_CPP_IS_BRIEF = NO
24
DETAILS_AT_TOP         = YES
25 24
INHERIT_DOCS           = NO
... ...
@@ -73,3 +72,3 @@
73 72
FILE_VERSION_FILTER    = 
74
LAYOUT_FILE            = DoxygenLayout.xml
73
LAYOUT_FILE            = "@abs_top_srcdir@/doc/DoxygenLayout.xml"
75 74
#---------------------------------------------------------------------------
... ...
@@ -116,3 +115,3 @@
116 115
#---------------------------------------------------------------------------
117
SOURCE_BROWSER         = NO
116
SOURCE_BROWSER         = @LEMON_DOC_SOURCE_BROWSER@
118 117
INLINE_SOURCES         = NO
... ...
@@ -225,5 +224,5 @@
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
Ignore white space 6 line context
... ...
@@ -10,2 +10,8 @@
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
... ...
@@ -68,1 +74,7 @@
68 74
)
75

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

	
Ignore white space 6 line context
... ...
@@ -43,3 +43,8 @@
43 43
IF(LEMON_HAVE_LP)
44
  ADD_EXECUTABLE(lp_test lp_test.cc)
44
  IF(${CMAKE_BUILD_TYPE} STREQUAL "Maintainer")
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)
... ...
@@ -79,3 +84,8 @@
79 84
IF(LEMON_HAVE_MIP)
80
  ADD_EXECUTABLE(mip_test mip_test.cc)
85
  IF(${CMAKE_BUILD_TYPE} STREQUAL "Maintainer")
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)
... ...
@@ -115,5 +125,10 @@
115 125
FOREACH(TEST_NAME ${TESTS})
116
  ADD_EXECUTABLE(${TEST_NAME} ${TEST_NAME}.cc)
126
  IF(${CMAKE_BUILD_TYPE} STREQUAL "Maintainer")
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)