1.1 --- a/CMakeLists.txt Sun Nov 14 09:25:03 2010 +0100
1.2 +++ b/CMakeLists.txt Mon Nov 15 07:52:53 2010 +0100
1.3 @@ -4,6 +4,7 @@
1.4 PROJECT(${PROJECT_NAME})
1.5
1.6 INCLUDE(FindPythonInterp)
1.7 +INCLUDE(FindWget)
1.8
1.9 IF(EXISTS ${PROJECT_SOURCE_DIR}/cmake/version.cmake)
1.10 INCLUDE(${PROJECT_SOURCE_DIR}/cmake/version.cmake)
2.1 --- a/doc/CMakeLists.txt Sun Nov 14 09:25:03 2010 +0100
2.2 +++ b/doc/CMakeLists.txt Mon Nov 15 07:52:53 2010 +0100
2.3 @@ -3,6 +3,8 @@
2.4 SET(abs_top_srcdir ${PROJECT_SOURCE_DIR})
2.5 SET(abs_top_builddir ${PROJECT_BINARY_DIR})
2.6
2.7 +SET(LEMON_DOC_SOURCE_BROWSER "NO" CACHE STRING "Include source into the doc (YES/NO).")
2.8 +
2.9 CONFIGURE_FILE(
2.10 ${PROJECT_SOURCE_DIR}/doc/Doxyfile.in
2.11 ${PROJECT_BINARY_DIR}/doc/Doxyfile
2.12 @@ -52,3 +54,15 @@
2.13 ENDIF()
2.14
2.15 ENDIF()
2.16 +
2.17 +IF(WGET_FOUND)
2.18 +ADD_CUSTOM_TARGET(update-external-tags
2.19 + COMMAND ${CMAKE_COMMAND} -E make_directory dl
2.20 + # COMMAND ${CMAKE_COMMAND} -E copy libstdc++.tag dl
2.21 + COMMAND ${WGET_EXECUTABLE} wget -P dl -N libstdc++.tag.tmp http://gcc.gnu.org/onlinedocs/libstdc++/latest-doxygen/libstdc++.tag
2.22 + COMMAND ${CMAKE_COMMAND} -E rename dl/libstdc++.tag libstdc++.tag
2.23 + COMMAND ${CMAKE_COMMAND} -E remove dl/libstdc++.tag
2.24 + COMMAND ${CMAKE_COMMAND} -E remove_directory dl
2.25 + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
2.26 + )
2.27 +ENDIF()
3.1 --- a/doc/Doxyfile.in Sun Nov 14 09:25:03 2010 +0100
3.2 +++ b/doc/Doxyfile.in Mon Nov 15 07:52:53 2010 +0100
3.3 @@ -70,7 +70,7 @@
3.4 SHOW_FILES = YES
3.5 SHOW_NAMESPACES = YES
3.6 FILE_VERSION_FILTER =
3.7 -LAYOUT_FILE = DoxygenLayout.xml
3.8 +LAYOUT_FILE = "@abs_top_srcdir@/doc/DoxygenLayout.xml"
3.9 #---------------------------------------------------------------------------
3.10 # configuration options related to warning and progress messages
3.11 #---------------------------------------------------------------------------
3.12 @@ -114,7 +114,7 @@
3.13 #---------------------------------------------------------------------------
3.14 # configuration options related to source browsing
3.15 #---------------------------------------------------------------------------
3.16 -SOURCE_BROWSER = NO
3.17 +SOURCE_BROWSER = @LEMON_DOC_SOURCE_BROWSER@
3.18 INLINE_SOURCES = NO
3.19 STRIP_CODE_COMMENTS = YES
3.20 REFERENCED_BY_RELATION = NO
3.21 @@ -225,7 +225,7 @@
3.22 #---------------------------------------------------------------------------
3.23 # Options related to the search engine
3.24 #---------------------------------------------------------------------------
3.25 -TAGFILES = "@abs_top_srcdir@/doc/libstdc++.tag = http://gcc.gnu.org/onlinedocs/libstdc++/latest-doxygen/ "
3.26 +TAGFILES = "@abs_top_builddir@/doc/libstdc++.tag = http://gcc.gnu.org/onlinedocs/libstdc++/latest-doxygen/ "
3.27 GENERATE_TAGFILE = html/lemon.tag
3.28 ALLEXTERNALS = NO
3.29 EXTERNAL_GROUPS = NO
4.1 --- a/lemon/CMakeLists.txt Sun Nov 14 09:25:03 2010 +0100
4.2 +++ b/lemon/CMakeLists.txt Mon Nov 15 07:52:53 2010 +0100
4.3 @@ -8,6 +8,12 @@
4.4 ${CMAKE_CURRENT_BINARY_DIR}/config.h
4.5 )
4.6
4.7 +CONFIGURE_FILE(
4.8 + ${CMAKE_CURRENT_SOURCE_DIR}/lemon.pc.cmake
4.9 + ${CMAKE_CURRENT_BINARY_DIR}/lemon.pc
4.10 + @ONLY
4.11 +)
4.12 +
4.13 SET(LEMON_SOURCES
4.14 arg_parser.cc
4.15 base.cc
4.16 @@ -66,3 +72,9 @@
4.17 DESTINATION include/lemon
4.18 COMPONENT headers
4.19 )
4.20 +
4.21 +INSTALL(
4.22 + FILES ${CMAKE_CURRENT_BINARY_DIR}/lemon.pc
4.23 + DESTINATION lib/pkgconfig
4.24 +)
4.25 +
5.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
5.2 +++ b/lemon/lemon.pc.cmake Mon Nov 15 07:52:53 2010 +0100
5.3 @@ -0,0 +1,10 @@
5.4 +prefix=@CMAKE_INSTALL_PREFIX@
5.5 +exec_prefix=@CMAKE_INSTALL_PREFIX@/bin
5.6 +libdir=@CMAKE_INSTALL_PREFIX@/lib
5.7 +includedir=@CMAKE_INSTALL_PREFIX@/include
5.8 +
5.9 +Name: @PROJECT_NAME@
5.10 +Description: Library for Efficient Modeling and Optimization in Networks
5.11 +Version: @PROJECT_VERSION@
5.12 +Libs: -L${libdir} -lemon @GLPK_LIBS@ @CPLEX_LIBS@ @SOPLEX_LIBS@ @CLP_LIBS@ @CBC_LIBS@
5.13 +Cflags: -I${includedir}
6.1 --- a/test/CMakeLists.txt Sun Nov 14 09:25:03 2010 +0100
6.2 +++ b/test/CMakeLists.txt Mon Nov 15 07:52:53 2010 +0100
6.3 @@ -47,7 +47,12 @@
6.4 )
6.5
6.6 IF(LEMON_HAVE_LP)
6.7 - ADD_EXECUTABLE(lp_test lp_test.cc)
6.8 + IF(${CMAKE_BUILD_TYPE} STREQUAL "Maintainer")
6.9 + ADD_EXECUTABLE(lp_test lp_test.cc)
6.10 + ELSE()
6.11 + ADD_EXECUTABLE(lp_test EXCLUDE_FROM_ALL lp_test.cc)
6.12 + ENDIF()
6.13 +
6.14 SET(LP_TEST_LIBS lemon)
6.15
6.16 IF(LEMON_HAVE_GLPK)
6.17 @@ -83,7 +88,12 @@
6.18 ENDIF()
6.19
6.20 IF(LEMON_HAVE_MIP)
6.21 - ADD_EXECUTABLE(mip_test mip_test.cc)
6.22 + IF(${CMAKE_BUILD_TYPE} STREQUAL "Maintainer")
6.23 + ADD_EXECUTABLE(mip_test mip_test.cc)
6.24 + ELSE()
6.25 + ADD_EXECUTABLE(mip_test EXCLUDE_FROM_ALL mip_test.cc)
6.26 + ENDIF()
6.27 +
6.28 SET(MIP_TEST_LIBS lemon)
6.29
6.30 IF(LEMON_HAVE_GLPK)