Changes in / [226:4c9d85f5dc93:222:f9a18c21dba8] in lemon-main
- Files:
-
- 4 deleted
- 7 edited
-
CMakeLists.txt (modified) (1 diff)
-
cmake/FindGhostscript.cmake (deleted)
-
cmake/nsis/lemon.ico (deleted)
-
cmake/nsis/uninstall.ico (deleted)
-
configure.ac (modified) (5 diffs)
-
demo/CMakeLists.txt (modified) (1 diff)
-
doc/CMakeLists.txt (deleted)
-
doc/Doxyfile.in (modified) (3 diffs)
-
lemon/CMakeLists.txt (modified) (1 diff)
-
test/CMakeLists.txt (modified) (2 diffs)
-
test/error_test.cc (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
CMakeLists.txt
r225 r141 1 CMAKE_MINIMUM_REQUIRED(VERSION 2.6) 2 3 #EXECUTE_PROCESS( 4 # COMMAND hg id -i 5 # OUTPUT_VARIABLE HG_REVISION 6 # OUTPUT_STRIP_TRAILING_WHITESPACE) 7 8 SET(PROJECT_NAME "Lemon") 9 SET(PROJECT_VERSION_MAJOR "0") 10 SET(PROJECT_VERSION_MINOR "99") 11 SET(PROJECT_VERSION_PATCH "0") 12 SET(PROJECT_VERSION 13 "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}") 14 15 PROJECT(${PROJECT_NAME}) 16 17 SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) 18 19 INCLUDE(FindDoxygen) 20 INCLUDE(FindGhostscript) 21 22 ENABLE_TESTING() 23 24 ADD_SUBDIRECTORY(lemon) 25 ADD_SUBDIRECTORY(demo) 26 ADD_SUBDIRECTORY(doc) 27 ADD_SUBDIRECTORY(test) 28 29 IF(WIN32) 30 INSTALL(FILES ${CMAKE_SOURCE_DIR}/cmake/nsis/lemon.ico 31 DESTINATION bin) 32 ENDIF(WIN32) 33 34 IF(WIN32) 35 SET(CPACK_PACKAGE_NAME ${PROJECT_NAME}) 36 SET(CPACK_PACKAGE_VENDOR 37 "EGRES - Egervary Research Group on Combinatorial Optimization") 38 SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY 39 "Lemon - Library of Efficient Models and Optimization in Networks") 40 SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE") 41 42 SET(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR}) 43 SET(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR}) 44 SET(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_VERSION_PATCH}) 45 SET(CPACK_PACKAGE_VERSION ${PROJECT_VERSION}) 46 47 SET(CPACK_PACKAGE_INSTALL_DIRECTORY 48 "${PROJECT_NAME} ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}") 49 SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY 50 "${PROJECT_NAME} ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}") 51 52 # Variables to generate a component-based installer. 53 #SET(CPACK_COMPONENTS_ALL headers library html_documentation) 54 55 #SET(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "C++ headers") 56 #SET(CPACK_COMPONENT_LIBRARY_DISPLAY_NAME "Static library") 57 #SET(CPACK_COMPONENT_HTML_DOCUMENTATION_DISPLAY_NAME "HTML documentation") 58 59 #SET(CPACK_COMPONENT_HEADERS_DESCRIPTION 60 # "C++ header files for use with the Lemon library") 61 #SET(CPACK_COMPONENT_LIBRARY_DESCRIPTION 62 # "Static library used to build programs with Lemon") 63 #SET(CPACK_COMPONENT_HTML_DOCUMENTATION_DESCRIPTION 64 # "Doxygen generated documentation") 65 66 #SET(CPACK_COMPONENT_HEADERS_DEPENDS library) 67 68 #SET(CPACK_COMPONENT_HEADERS_GROUP "Development") 69 #SET(CPACK_COMPONENT_LIBRARY_GROUP "Development") 70 #SET(CPACK_COMPONENT_HTML_DOCUMENTATION_GROUP "Documentation") 71 72 #SET(CPACK_COMPONENT_GROUP_DEVELOPMENT_DESCRIPTION 73 # "Components needed to develop software using Lemon") 74 #SET(CPACK_COMPONENT_GROUP_DOCUMENTATION_DESCRIPTION 75 # "Documentation of Lemon") 76 77 #SET(CPACK_ALL_INSTALL_TYPES Full Developer) 78 79 #SET(CPACK_COMPONENT_HEADERS_INSTALL_TYPES Developer Full) 80 #SET(CPACK_COMPONENT_LIBRARY_INSTALL_TYPES Developer Full) 81 #SET(CPACK_COMPONENT_HTML_DOCUMENTATION_INSTALL_TYPES Full) 82 83 SET(CPACK_GENERATOR "NSIS") 84 SET(CPACK_NSIS_MUI_ICON "${CMAKE_SOURCE_DIR}/cmake/nsis/lemon.ico") 85 SET(CPACK_NSIS_MUI_UNIICON "${CMAKE_SOURCE_DIR}/cmake/nsis/uninstall.ico") 86 #SET(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/cmake/nsis\\\\installer.bmp") 87 SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\lemon.ico") 88 SET(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY} ${PROJECT_NAME}") 89 SET(CPACK_NSIS_HELP_LINK "http:\\\\\\\\lemon.cs.elte.hu") 90 SET(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\lemon.cs.elte.hu") 91 SET(CPACK_NSIS_CONTACT "lemon-user@lemon.cs.elte.hu") 92 SET(CPACK_NSIS_CREATE_ICONS_EXTRA " 93 CreateShortCut \\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Documentation.lnk\\\" \\\"$INSTDIR\\\\doc\\\\index.html\\\" 94 ") 95 SET(CPACK_NSIS_DELETE_ICONS_EXTRA " 96 !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP 97 Delete \\\"$SMPROGRAMS\\\\$MUI_TEMP\\\\Documentation.lnk\\\" 98 ") 99 100 INCLUDE(CPack) 101 ENDIF(WIN32) 1 project (LEMON) 2 enable_testing () 3 add_subdirectory (lemon) 4 add_subdirectory (demo) 5 add_subdirectory (test) -
configure.ac
r226 r219 7 7 8 8 AC_PREREQ([2.59]) 9 AC_INIT([L emon], [lemon_version()], [lemon-user@lemon.cs.elte.hu], [lemon])9 AC_INIT([LEMON], [lemon_version()], [lemon-devel@lemon.cs.elte.hu], [lemon]) 10 10 AC_CONFIG_AUX_DIR([build-aux]) 11 11 AC_CONFIG_MACRO_DIR([m4]) … … 26 26 AC_CHECK_PROG([gs_found],[gs],[yes],[no]) 27 27 28 dnl Set custom compiler flags when using g++.29 28 if test x"$lx_cmdline_cxxflags_set" != x"set" -a "$GXX" = yes; then 30 29 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" … … 36 35 LX_CHECK_SOPLEX 37 36 38 dnl Disable/enable building the demo programs .37 dnl Disable/enable building the demo programs 39 38 AC_ARG_ENABLE([demo], 40 39 AS_HELP_STRING([--enable-demo], [build the demo programs]) … … 49 48 AM_CONDITIONAL([WANT_DEMO], [test x"$enable_demo" != x"no"]) 50 49 51 dnl Disable/enable building the binary tools .50 dnl Disable/enable building the binary tools 52 51 AC_ARG_ENABLE([tools], 53 52 AS_HELP_STRING([--enable-tools], [build additional tools @<:@default@:>@]) … … 62 61 AM_CONDITIONAL([WANT_TOOLS], [test x"$enable_tools" != x"no"]) 63 62 64 dnl Disable/enable building the benchmarks .63 dnl Disable/enable building the benchmarks 65 64 AC_ARG_ENABLE([benchmark], 66 65 AS_HELP_STRING([--enable-benchmark], [build the benchmarks]) -
demo/CMakeLists.txt
r225 r141 1 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR})1 include_directories (${LEMON_SOURCE_DIR}) 2 2 3 LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/lemon)3 link_directories (${LEMON_BINARY_DIR}/lemon) 4 4 5 SET(DEMOS5 set (DEMOS 6 6 arg_parser_demo 7 7 graph_to_eps_demo 8 8 lgf_demo) 9 9 10 FOREACH(DEMO_NAME ${DEMOS})11 ADD_EXECUTABLE(${DEMO_NAME} ${DEMO_NAME}.cc)12 TARGET_LINK_LIBRARIES(${DEMO_NAME} lemon)13 ENDFOREACH(DEMO_NAME)10 foreach (DEMO_NAME ${DEMOS}) 11 add_executable (${DEMO_NAME} ${DEMO_NAME}.cc) 12 target_link_libraries (${DEMO_NAME} lemon) 13 endforeach (DEMO_NAME) -
doc/Doxyfile.in
r226 r219 16 16 INLINE_INHERITED_MEMB = NO 17 17 FULL_PATH_NAMES = YES 18 STRIP_FROM_PATH = "@abs_top_srcdir@"19 STRIP_FROM_INC_PATH = "@abs_top_srcdir@"18 STRIP_FROM_PATH = @abs_top_srcdir@ 19 STRIP_FROM_INC_PATH = @abs_top_srcdir@ 20 20 SHORT_NAMES = YES 21 21 JAVADOC_AUTOBRIEF = NO … … 81 81 # configuration options related to the input files 82 82 #--------------------------------------------------------------------------- 83 INPUT = "@abs_top_srcdir@/doc"\84 "@abs_top_srcdir@/lemon"\85 "@abs_top_srcdir@/lemon/bits"\86 "@abs_top_srcdir@/lemon/concepts"\87 "@abs_top_srcdir@/demo"\88 "@abs_top_srcdir@/tools"\89 "@abs_top_srcdir@/test/test_tools.h"83 INPUT = @abs_top_srcdir@/doc \ 84 @abs_top_srcdir@/lemon \ 85 @abs_top_srcdir@/lemon/bits \ 86 @abs_top_srcdir@/lemon/concepts \ 87 @abs_top_srcdir@/demo \ 88 @abs_top_srcdir@/tools \ 89 @abs_top_srcdir@/test/test_tools.h 90 90 INPUT_ENCODING = UTF-8 91 91 FILE_PATTERNS = *.h \ … … 97 97 EXCLUDE_PATTERNS = 98 98 EXCLUDE_SYMBOLS = 99 EXAMPLE_PATH = "@abs_top_srcdir@/demo"\100 "@abs_top_srcdir@/LICENSE"\101 "@abs_top_srcdir@/doc"99 EXAMPLE_PATH = @abs_top_srcdir@/demo \ 100 @abs_top_srcdir@/LICENSE \ 101 @abs_top_srcdir@/doc 102 102 EXAMPLE_PATTERNS = 103 103 EXAMPLE_RECURSIVE = NO 104 IMAGE_PATH = "@abs_top_srcdir@/doc/images"\105 "@abs_top_builddir@/doc/gen-images"104 IMAGE_PATH = @abs_top_srcdir@/doc/images \ 105 @abs_top_builddir@/doc/gen-images 106 106 INPUT_FILTER = 107 107 FILTER_PATTERNS = -
lemon/CMakeLists.txt
r225 r141 1 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}) 2 3 ADD_LIBRARY(lemon 4 arg_parser.cc 5 base.cc 6 color.cc 7 random.cc) 8 9 INSTALL( 10 TARGETS lemon 11 ARCHIVE DESTINATION lib 12 COMPONENT library) 13 14 INSTALL( 15 DIRECTORY . bits concepts 16 DESTINATION include/lemon 17 COMPONENT headers 18 FILES_MATCHING PATTERN "*.h") 1 include_directories (${LEMON_SOURCE_DIR}) 2 add_library (lemon arg_parser.cc base.cc color.cc random.cc) -
test/CMakeLists.txt
r225 r203 1 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR})1 include_directories (${LEMON_SOURCE_DIR}) 2 2 3 LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/lemon)3 link_directories (${LEMON_BINARY_DIR}/lemon) 4 4 5 SET(TESTS5 set (TESTS 6 6 bfs_test 7 7 counter_test … … 17 17 kruskal_test 18 18 maps_test 19 path_test 19 20 random_test 20 path_test21 21 time_measure_test 22 22 unionfind_test) 23 23 24 FOREACH(TEST_NAME ${TESTS})25 ADD_EXECUTABLE(${TEST_NAME} ${TEST_NAME}.cc)26 TARGET_LINK_LIBRARIES(${TEST_NAME} lemon)27 ADD_TEST(${TEST_NAME} ${TEST_NAME})28 ENDFOREACH(TEST_NAME)24 foreach (TEST_NAME ${TESTS}) 25 add_executable (${TEST_NAME} ${TEST_NAME}.cc) 26 target_link_libraries (${TEST_NAME} lemon) 27 add_test(${TEST_NAME} ${TEST_NAME}) 28 endforeach (TEST_NAME) -
test/error_test.cc
r223 r209 30 30 #ifdef LEMON_DISABLE_ASSERTS 31 31 #undef LEMON_DISABLE_ASSERTS 32 #endif33 34 #ifdef NDEBUG35 #undef NDEBUG36 32 #endif 37 33
Note: See TracChangeset
for help on using the changeset viewer.
