gravatar
alpar (Alpar Juttner)
alpar@cs.elte.hu
Merge (manually add cmake/FindGLPK.cmake to Makefile.am)
0 4 1
merge default
3 files changed with 39 insertions and 34 deletions:
↑ Collapse diff ↑
Ignore white space 24 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
INCLUDE(FindDoxygen)
11 15
INCLUDE(FindGhostscript)
12 16
FIND_PACKAGE(GLPK 4.33)
13 17

	
14 18
ADD_DEFINITIONS(-DHAVE_CONFIG_H)
15 19

	
16 20
IF(MSVC)
... ...
@@ -27,73 +31,66 @@
27 31
  SET(HAVE_MIP TRUE)
28 32
  SET(HAVE_GLPK TRUE)
29 33
ENDIF(GLPK_FOUND)
30 34

	
31 35
ENABLE_TESTING()
32 36

	
33 37
ADD_SUBDIRECTORY(lemon)
34 38
ADD_SUBDIRECTORY(demo)
35 39
ADD_SUBDIRECTORY(doc)
36 40
ADD_SUBDIRECTORY(test)
37 41

	
38 42
IF(WIN32)
39
  INSTALL(FILES ${CMAKE_SOURCE_DIR}/cmake/nsis/lemon.ico
40
    DESTINATION bin)
41
ENDIF(WIN32)
42

	
43
IF(WIN32)
44 43
  SET(CPACK_PACKAGE_NAME ${PROJECT_NAME})
45
  SET(CPACK_PACKAGE_VENDOR
46
    "EGRES - Egervary Research Group on Combinatorial Optimization")
44
  SET(CPACK_PACKAGE_VENDOR "EGRES")
47 45
  SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY
48 46
    "LEMON - Library of Efficient Models and Optimization in Networks")
49 47
  SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE")
50 48

	
51 49
  SET(CPACK_PACKAGE_VERSION ${PROJECT_VERSION})
52 50

	
53 51
  SET(CPACK_PACKAGE_INSTALL_DIRECTORY
54 52
    "${PROJECT_NAME} ${PROJECT_VERSION}")
55 53
  SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY
56 54
    "${PROJECT_NAME} ${PROJECT_VERSION}")
57 55

	
58
  # Variables to generate a component-based installer.
59
  #SET(CPACK_COMPONENTS_ALL headers library html_documentation)
56
  SET(CPACK_COMPONENTS_ALL headers library html_documentation)
60 57

	
61
  #SET(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "C++ headers")
62
  #SET(CPACK_COMPONENT_LIBRARY_DISPLAY_NAME "Static library")
63
  #SET(CPACK_COMPONENT_HTML_DOCUMENTATION_DISPLAY_NAME "HTML documentation")
58
  SET(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "C++ headers")
59
  SET(CPACK_COMPONENT_LIBRARY_DISPLAY_NAME "Dynamic-link library")
60
  SET(CPACK_COMPONENT_HTML_DOCUMENTATION_DISPLAY_NAME "HTML documentation")
64 61

	
65
  #SET(CPACK_COMPONENT_HEADERS_DESCRIPTION
66
  #  "C++ header files for use with the LEMON library")
67
  #SET(CPACK_COMPONENT_LIBRARY_DESCRIPTION
68
  #  "Static library used to build programs with LEMON")
69
  #SET(CPACK_COMPONENT_HTML_DOCUMENTATION_DESCRIPTION
70
  #  "Doxygen generated documentation")
62
  SET(CPACK_COMPONENT_HEADERS_DESCRIPTION
63
    "C++ header files")
64
  SET(CPACK_COMPONENT_LIBRARY_DESCRIPTION
65
    "DLL and import library")
66
  SET(CPACK_COMPONENT_HTML_DOCUMENTATION_DESCRIPTION
67
    "Doxygen generated documentation")
71 68

	
72
  #SET(CPACK_COMPONENT_HEADERS_DEPENDS library)
69
  SET(CPACK_COMPONENT_HEADERS_DEPENDS library)
73 70

	
74
  #SET(CPACK_COMPONENT_HEADERS_GROUP "Development")
75
  #SET(CPACK_COMPONENT_LIBRARY_GROUP "Development")
76
  #SET(CPACK_COMPONENT_HTML_DOCUMENTATION_GROUP "Documentation")
71
  SET(CPACK_COMPONENT_HEADERS_GROUP "Development")
72
  SET(CPACK_COMPONENT_LIBRARY_GROUP "Development")
73
  SET(CPACK_COMPONENT_HTML_DOCUMENTATION_GROUP "Documentation")
77 74

	
78
  #SET(CPACK_COMPONENT_GROUP_DEVELOPMENT_DESCRIPTION
79
  #  "Components needed to develop software using LEMON")
80
  #SET(CPACK_COMPONENT_GROUP_DOCUMENTATION_DESCRIPTION
81
  #  "Documentation of LEMON")
75
  SET(CPACK_COMPONENT_GROUP_DEVELOPMENT_DESCRIPTION
76
    "Components needed to develop software using LEMON")
77
  SET(CPACK_COMPONENT_GROUP_DOCUMENTATION_DESCRIPTION
78
    "Documentation of LEMON")
82 79

	
83
  #SET(CPACK_ALL_INSTALL_TYPES Full Developer)
80
  SET(CPACK_ALL_INSTALL_TYPES Full Developer)
84 81

	
85
  #SET(CPACK_COMPONENT_HEADERS_INSTALL_TYPES Developer Full)
86
  #SET(CPACK_COMPONENT_LIBRARY_INSTALL_TYPES Developer Full)
87
  #SET(CPACK_COMPONENT_HTML_DOCUMENTATION_INSTALL_TYPES Full)
82
  SET(CPACK_COMPONENT_HEADERS_INSTALL_TYPES Developer Full)
83
  SET(CPACK_COMPONENT_LIBRARY_INSTALL_TYPES Developer Full)
84
  SET(CPACK_COMPONENT_HTML_DOCUMENTATION_INSTALL_TYPES Full)
88 85

	
89 86
  SET(CPACK_GENERATOR "NSIS")
90 87
  SET(CPACK_NSIS_MUI_ICON "${CMAKE_SOURCE_DIR}/cmake/nsis/lemon.ico")
91 88
  SET(CPACK_NSIS_MUI_UNIICON "${CMAKE_SOURCE_DIR}/cmake/nsis/uninstall.ico")
92 89
  #SET(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/cmake/nsis\\\\installer.bmp")
93 90
  SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\lemon.ico")
94 91
  SET(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY} ${PROJECT_NAME}")
95 92
  SET(CPACK_NSIS_HELP_LINK "http:\\\\\\\\lemon.cs.elte.hu")
96 93
  SET(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\lemon.cs.elte.hu")
97 94
  SET(CPACK_NSIS_CONTACT "lemon-user@lemon.cs.elte.hu")
98 95
  SET(CPACK_NSIS_CREATE_ICONS_EXTRA "
99 96
    CreateShortCut \\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Documentation.lnk\\\" \\\"$INSTDIR\\\\doc\\\\index.html\\\"
Ignore white space 6 line context
... ...
@@ -3,25 +3,30 @@
3 3
AM_CXXFLAGS = $(WARNINGCXXFLAGS)
4 4

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

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

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

	
97 97
dnl Checks for library functions.
98 98
AC_HEADER_STDC
99 99
AC_CHECK_FUNCS(gettimeofday times ctime_r)
100 100

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

	
105 105
AC_CONFIG_FILES([
106 106
Makefile
107
cmake/version.cmake
107 108
doc/Doxyfile
108 109
lemon/lemon.pc
109 110
])
110 111

	
111 112
AC_OUTPUT
112 113

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