gravatar
alpar (Alpar Juttner)
alpar@cs.elte.hu
Merge build system updates
0 4 1
merge 1.0
1 file changed with 38 insertions and 34 deletions:
↑ Collapse diff ↑
Ignore white space 6 line context
1
SET(PROJECT_NAME "@PACKAGE_NAME@")
2
SET(PROJECT_VERSION "@PACKAGE_VERSION@" CACHE STRING "LEMON version string.")
Ignore white space 6 line context
1 1
CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
2 2

	
3
SET(PROJECT_NAME "LEMON")
4
SET(PROJECT_VERSION "hg-tip" CACHE STRING "The version string.")
3
IF(EXISTS ${CMAKE_SOURCE_DIR}/cmake/version.cmake)
4
  INCLUDE(${CMAKE_SOURCE_DIR}/cmake/version.cmake)
5
ELSE(EXISTS ${CMAKE_SOURCE_DIR}/cmake/version.cmake)
6
  SET(PROJECT_NAME "LEMON")
7
  SET(PROJECT_VERSION "hg-tip" CACHE STRING "LEMON version string.")
8
ENDIF(EXISTS ${CMAKE_SOURCE_DIR}/cmake/version.cmake)
5 9

	
6 10
PROJECT(${PROJECT_NAME})
7 11

	
8 12
SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
9 13

	
10 14
IF(MSVC)
11 15
  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4250 /wd4355 /wd4800 /wd4996")
12 16
# Suppressed warnings:
13 17
# C4250: 'class1' : inherits 'class2::member' via dominance
14 18
# C4355: 'this' : used in base member initializer list
15 19
# C4800: 'type' : forcing value to bool 'true' or 'false' (performance warning)
16 20
# C4996: 'function': was declared deprecated
... ...
@@ -18,73 +22,66 @@
18 22

	
19 23
INCLUDE(FindDoxygen)
20 24
INCLUDE(FindGhostscript)
21 25

	
22 26
ENABLE_TESTING()
23 27

	
24 28
ADD_SUBDIRECTORY(lemon)
25 29
ADD_SUBDIRECTORY(demo)
26 30
ADD_SUBDIRECTORY(doc)
27 31
ADD_SUBDIRECTORY(test)
28 32

	
29 33
IF(WIN32)
30
  INSTALL(FILES ${CMAKE_SOURCE_DIR}/cmake/nsis/lemon.ico
31
    DESTINATION bin)
32
ENDIF(WIN32)
33

	
34
IF(WIN32)
35 34
  SET(CPACK_PACKAGE_NAME ${PROJECT_NAME})
36
  SET(CPACK_PACKAGE_VENDOR
37
    "EGRES - Egervary Research Group on Combinatorial Optimization")
35
  SET(CPACK_PACKAGE_VENDOR "EGRES")
38 36
  SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY
39 37
    "LEMON - Library of Efficient Models and Optimization in Networks")
40 38
  SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE")
41 39

	
42 40
  SET(CPACK_PACKAGE_VERSION ${PROJECT_VERSION})
43 41

	
44 42
  SET(CPACK_PACKAGE_INSTALL_DIRECTORY
45 43
    "${PROJECT_NAME} ${PROJECT_VERSION}")
46 44
  SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY
47 45
    "${PROJECT_NAME} ${PROJECT_VERSION}")
48 46

	
49
  # Variables to generate a component-based installer.
50
  #SET(CPACK_COMPONENTS_ALL headers library html_documentation)
47
  SET(CPACK_COMPONENTS_ALL headers library html_documentation)
51 48

	
52
  #SET(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "C++ headers")
53
  #SET(CPACK_COMPONENT_LIBRARY_DISPLAY_NAME "Static library")
54
  #SET(CPACK_COMPONENT_HTML_DOCUMENTATION_DISPLAY_NAME "HTML documentation")
49
  SET(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "C++ headers")
50
  SET(CPACK_COMPONENT_LIBRARY_DISPLAY_NAME "Dynamic-link library")
51
  SET(CPACK_COMPONENT_HTML_DOCUMENTATION_DISPLAY_NAME "HTML documentation")
55 52

	
56
  #SET(CPACK_COMPONENT_HEADERS_DESCRIPTION
57
  #  "C++ header files for use with the LEMON library")
58
  #SET(CPACK_COMPONENT_LIBRARY_DESCRIPTION
59
  #  "Static library used to build programs with LEMON")
60
  #SET(CPACK_COMPONENT_HTML_DOCUMENTATION_DESCRIPTION
61
  #  "Doxygen generated documentation")
53
  SET(CPACK_COMPONENT_HEADERS_DESCRIPTION
54
    "C++ header files")
55
  SET(CPACK_COMPONENT_LIBRARY_DESCRIPTION
56
    "DLL and import library")
57
  SET(CPACK_COMPONENT_HTML_DOCUMENTATION_DESCRIPTION
58
    "Doxygen generated documentation")
62 59

	
63
  #SET(CPACK_COMPONENT_HEADERS_DEPENDS library)
60
  SET(CPACK_COMPONENT_HEADERS_DEPENDS library)
64 61

	
65
  #SET(CPACK_COMPONENT_HEADERS_GROUP "Development")
66
  #SET(CPACK_COMPONENT_LIBRARY_GROUP "Development")
67
  #SET(CPACK_COMPONENT_HTML_DOCUMENTATION_GROUP "Documentation")
62
  SET(CPACK_COMPONENT_HEADERS_GROUP "Development")
63
  SET(CPACK_COMPONENT_LIBRARY_GROUP "Development")
64
  SET(CPACK_COMPONENT_HTML_DOCUMENTATION_GROUP "Documentation")
68 65

	
69
  #SET(CPACK_COMPONENT_GROUP_DEVELOPMENT_DESCRIPTION
70
  #  "Components needed to develop software using LEMON")
71
  #SET(CPACK_COMPONENT_GROUP_DOCUMENTATION_DESCRIPTION
72
  #  "Documentation of LEMON")
66
  SET(CPACK_COMPONENT_GROUP_DEVELOPMENT_DESCRIPTION
67
    "Components needed to develop software using LEMON")
68
  SET(CPACK_COMPONENT_GROUP_DOCUMENTATION_DESCRIPTION
69
    "Documentation of LEMON")
73 70

	
74
  #SET(CPACK_ALL_INSTALL_TYPES Full Developer)
71
  SET(CPACK_ALL_INSTALL_TYPES Full Developer)
75 72

	
76
  #SET(CPACK_COMPONENT_HEADERS_INSTALL_TYPES Developer Full)
77
  #SET(CPACK_COMPONENT_LIBRARY_INSTALL_TYPES Developer Full)
78
  #SET(CPACK_COMPONENT_HTML_DOCUMENTATION_INSTALL_TYPES Full)
73
  SET(CPACK_COMPONENT_HEADERS_INSTALL_TYPES Developer Full)
74
  SET(CPACK_COMPONENT_LIBRARY_INSTALL_TYPES Developer Full)
75
  SET(CPACK_COMPONENT_HTML_DOCUMENTATION_INSTALL_TYPES Full)
79 76

	
80 77
  SET(CPACK_GENERATOR "NSIS")
81 78
  SET(CPACK_NSIS_MUI_ICON "${CMAKE_SOURCE_DIR}/cmake/nsis/lemon.ico")
82 79
  SET(CPACK_NSIS_MUI_UNIICON "${CMAKE_SOURCE_DIR}/cmake/nsis/uninstall.ico")
83 80
  #SET(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/cmake/nsis\\\\installer.bmp")
84 81
  SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\lemon.ico")
85 82
  SET(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY} ${PROJECT_NAME}")
86 83
  SET(CPACK_NSIS_HELP_LINK "http:\\\\\\\\lemon.cs.elte.hu")
87 84
  SET(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\lemon.cs.elte.hu")
88 85
  SET(CPACK_NSIS_CONTACT "lemon-user@lemon.cs.elte.hu")
89 86
  SET(CPACK_NSIS_CREATE_ICONS_EXTRA "
90 87
    CreateShortCut \\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Documentation.lnk\\\" \\\"$INSTDIR\\\\doc\\\\index.html\\\"
Ignore white space 6 line context
1 1
ACLOCAL_AMFLAGS = -I m4
2 2

	
3 3
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
4 4
LDADD = $(top_builddir)/lemon/libemon.la
5 5

	
6 6
EXTRA_DIST = \
7 7
	AUTHORS \
8 8
	LICENSE \
9 9
	m4/lx_check_cplex.m4 \
10 10
	m4/lx_check_glpk.m4 \
11 11
	m4/lx_check_soplex.m4 \
12 12
	CMakeLists.txt \
13
	cmake
13
	cmake/FindGhostscript.cmake \
14
	cmake/version.cmake.in \
15
	cmake/version.cmake \
16
	cmake/nsis/lemon.ico \
17
	cmake/nsis/uninstall.ico
14 18

	
15 19
pkgconfigdir = $(libdir)/pkgconfig
16 20
lemondir = $(pkgincludedir)
17 21
bitsdir = $(lemondir)/bits
18 22
conceptdir = $(lemondir)/concepts
19 23
pkgconfig_DATA =
20 24
lib_LTLIBRARIES =
21 25
lemon_HEADERS =
22 26
bits_HEADERS =
23 27
concept_HEADERS =
24 28
noinst_HEADERS =
25 29
noinst_PROGRAMS =
Ignore white space 6 line context
modified binary file
Ignore white space 24 line context
... ...
@@ -88,28 +88,29 @@
88 88
AC_C_CONST
89 89
AC_C_INLINE
90 90
AC_TYPE_SIZE_T
91 91
AC_HEADER_TIME
92 92
AC_STRUCT_TM
93 93

	
94 94
dnl Checks for library functions.
95 95
AC_HEADER_STDC
96 96
AC_CHECK_FUNCS(gettimeofday times ctime_r)
97 97

	
98 98
dnl Add dependencies on files generated by configure.
99 99
AC_SUBST([CONFIG_STATUS_DEPENDENCIES],
100
  ['$(top_srcdir)/doc/Doxyfile.in $(top_srcdir)/lemon/lemon.pc.in'])
100
  ['$(top_srcdir)/doc/Doxyfile.in $(top_srcdir)/lemon/lemon.pc.in $(top_srcdir)/cmake/version.cmake.in'])
101 101

	
102 102
AC_CONFIG_FILES([
103 103
Makefile
104
cmake/version.cmake
104 105
doc/Doxyfile
105 106
lemon/lemon.pc
106 107
])
107 108

	
108 109
AC_OUTPUT
109 110

	
110 111
echo
111 112
echo '****************************** SUMMARY ******************************'
112 113
echo
113 114
echo Package version............... : $PACKAGE-$VERSION
114 115
echo
115 116
echo C++ compiler.................. : $CXX
0 comments (0 inline)