Changeset 555:861a9d5ff283 in lemon
- Timestamp:
- 01/23/09 17:42:07 (16 years ago)
- Branch:
- default
- Children:
- 556:c5919679af17, 559:9b9ffe7d9b75
- Parents:
- 554:e6ae4999cf22 (diff), 503:64c2641286df (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent. - Phase:
- public
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
CMakeLists.txt
r503 r555 14 14 INCLUDE(FindDoxygen) 15 15 INCLUDE(FindGhostscript) 16 FIND_PACKAGE(GLPK 4.33) 17 18 ADD_DEFINITIONS(-DHAVE_CONFIG_H) 19 20 IF(MSVC) 21 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4250 /wd4355 /wd4800 /wd4996") 22 # Suppressed warnings: 23 # C4250: 'class1' : inherits 'class2::member' via dominance 24 # C4355: 'this' : used in base member initializer list 25 # C4800: 'type' : forcing value to bool 'true' or 'false' (performance warning) 26 # C4996: 'function': was declared deprecated 27 ENDIF(MSVC) 28 29 IF(GLPK_FOUND) 30 SET(HAVE_LP TRUE) 31 SET(HAVE_MIP TRUE) 32 SET(HAVE_GLPK TRUE) 33 ENDIF(GLPK_FOUND) 16 34 17 35 ENABLE_TESTING() -
CMakeLists.txt
r554 r555 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}) … … 37 41 38 42 IF(WIN32) 39 INSTALL(FILES ${CMAKE_SOURCE_DIR}/cmake/nsis/lemon.ico40 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") … … 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 "Staticlibrary")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_DESCRIPTION66 # "C++ header files for use with the LEMON library")67 #SET(CPACK_COMPONENT_LIBRARY_DESCRIPTION68 # "Static library used to build programs with LEMON")69 #SET(CPACK_COMPONENT_HTML_DOCUMENTATION_DESCRIPTION70 #"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_DESCRIPTION79 #"Components needed to develop software using LEMON")80 #SET(CPACK_COMPONENT_GROUP_DOCUMENTATION_DESCRIPTION81 #"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") -
Makefile.am
r503 r555 1 1 ACLOCAL_AMFLAGS = -I m4 2 3 AM_CXXFLAGS = $(WARNINGCXXFLAGS) 2 4 3 5 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) … … 12 14 CMakeLists.txt \ 13 15 cmake/FindGhostscript.cmake \ 16 cmake/FindGLPK.cmake \ 14 17 cmake/version.cmake.in \ 15 18 cmake/version.cmake \ -
Makefile.am
r375 r555 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 -
configure.ac
r503 r555 19 19 AC_CONFIG_SRCDIR([lemon/list_graph.h]) 20 20 AC_CONFIG_HEADERS([config.h lemon/config.h]) 21 22 lx_cmdline_cxxflags_set=${CXXFLAGS+set}23 21 24 22 dnl Do compilation tests using the C++ compiler. … … 47 45 48 46 dnl Set custom compiler flags when using g++. 49 if test x"$lx_cmdline_cxxflags_set" != x"set" -a"$GXX" = yes -a "$ICC" = no; then50 CXXFLAGS="$CXXFLAGS -Wall -W -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-Woverloaded-virtual -ansi -fno-strict-aliasing -Wold-style-cast -Wno-unknown-pragmas"47 if test "$GXX" = yes -a "$ICC" = no; then 48 WARNINGCXXFLAGS="-Wall -W -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" 51 49 fi 50 AC_SUBST([WARNINGCXXFLAGS]) 52 51 53 52 dnl Checks for libraries. 54 #LX_CHECK_GLPK 55 #LX_CHECK_CPLEX 56 #LX_CHECK_SOPLEX 53 LX_CHECK_GLPK 54 LX_CHECK_CPLEX 55 LX_CHECK_SOPLEX 56 LX_CHECK_CLP 57 58 AM_CONDITIONAL([HAVE_LP], [test x"$lx_lp_found" = x"yes"]) 59 AM_CONDITIONAL([HAVE_MIP], [test x"$lx_mip_found" = x"yes"]) 57 60 58 61 dnl Disable/enable building the demo programs. … … 115 118 echo 116 119 echo C++ compiler.................. : $CXX 117 echo C++ compiles flags............ : $ CXXFLAGS120 echo C++ compiles flags............ : $WARNINGCXXFLAGS $CXXFLAGS 118 121 echo 119 #echo GLPK support.................. : $lx_glpk_found 120 #echo CPLEX support................. : $lx_cplex_found 121 #echo SOPLEX support................ : $lx_soplex_found 122 #echo 122 echo GLPK support.................. : $lx_glpk_found 123 echo CPLEX support................. : $lx_cplex_found 124 echo SOPLEX support................ : $lx_soplex_found 125 echo CLP support................... : $lx_clp_found 126 echo 123 127 echo Build demo programs........... : $enable_demo 124 128 echo Build additional tools........ : $enable_tools -
configure.ac
r482 r555 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
Note: See TracChangeset
for help on using the changeset viewer.