[Lemon-commits] Alpar Juttner: Merge CMAKE backports to branch 1.2
Lemon HG
hg at lemon.cs.elte.hu
Fri Mar 4 12:21:41 CET 2011
details: http://lemon.cs.elte.hu/hg/lemon/rev/d149eaf24638
changeset: 1035:d149eaf24638
user: Alpar Juttner <alpar [at] cs.elte.hu>
date: Fri Mar 04 10:40:44 2011 +0100
description:
Merge CMAKE backports to branch 1.2
diffstat:
CMakeLists.txt | 91 ++++++++++++++++++++++++++++++++++++++++++++-
doc/CMakeLists.txt | 14 +++++++
doc/Doxyfile.in | 6 +-
lemon/CMakeLists.txt | 12 ++++++
lemon/lemon.pc.cmake | 10 +++++
test/CMakeLists.txt | 21 +++++++++-
6 files changed, 145 insertions(+), 9 deletions(-)
diffs (280 lines):
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,12 +3,22 @@
SET(PROJECT_NAME "LEMON")
PROJECT(${PROJECT_NAME})
+INCLUDE(FindPythonInterp)
+INCLUDE(FindWget)
+
IF(EXISTS ${PROJECT_SOURCE_DIR}/cmake/version.cmake)
INCLUDE(${PROJECT_SOURCE_DIR}/cmake/version.cmake)
ELSEIF(DEFINED ENV{LEMON_VERSION})
SET(LEMON_VERSION $ENV{LEMON_VERSION} CACHE STRING "LEMON version string.")
ELSE()
EXECUTE_PROCESS(
+ COMMAND ${PYTHON_EXECUTABLE} ./scripts/chg-len.py
+ WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+ OUTPUT_VARIABLE HG_REVISION_PATH
+ ERROR_QUIET
+ OUTPUT_STRIP_TRAILING_WHITESPACE
+ )
+ EXECUTE_PROCESS(
COMMAND hg id -i
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
OUTPUT_VARIABLE HG_REVISION
@@ -16,9 +26,15 @@
OUTPUT_STRIP_TRAILING_WHITESPACE
)
IF(HG_REVISION STREQUAL "")
- SET(HG_REVISION "hg-tip")
+ SET(HG_REVISION_ID "hg-tip")
+ ELSE()
+ IF(HG_REVISION_PATH STREQUAL "")
+ SET(HG_REVISION_ID ${HG_REVISION})
+ ELSE()
+ SET(HG_REVISION_ID ${HG_REVISION_PATH}.${HG_REVISION})
+ ENDIF()
ENDIF()
- SET(LEMON_VERSION ${HG_REVISION} CACHE STRING "LEMON version string.")
+ SET(LEMON_VERSION ${HG_REVISION_ID} CACHE STRING "LEMON version string.")
ENDIF()
SET(PROJECT_VERSION ${LEMON_VERSION})
@@ -31,6 +47,69 @@
FIND_PACKAGE(CPLEX)
FIND_PACKAGE(COIN)
+IF(DEFINED ENV{LEMON_CXX_WARNING})
+ SET(CXX_WARNING $ENV{LEMON_CXX_WARNING})
+ELSE()
+ IF(CMAKE_COMPILER_IS_GNUCXX)
+ SET(CXX_WARNING "-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")
+ SET(CMAKE_CXX_FLAGS_DEBUG CACHE STRING "-ggdb")
+ SET(CMAKE_C_FLAGS_DEBUG CACHE STRING "-ggdb")
+ ELSEIF(MSVC)
+ # This part is unnecessary 'casue the same is set by the lemon/core.h.
+ # Still keep it as an example.
+ SET(CXX_WARNING "/wd4250 /wd4355 /wd4503 /wd4800 /wd4996")
+ # Suppressed warnings:
+ # C4250: 'class1' : inherits 'class2::member' via dominance
+ # C4355: 'this' : used in base member initializer list
+ # C4503: 'function' : decorated name length exceeded, name was truncated
+ # C4800: 'type' : forcing value to bool 'true' or 'false'
+ # (performance warning)
+ # C4996: 'function': was declared deprecated
+ ELSE()
+ SET(CXX_WARNING "-Wall -W")
+ ENDIF()
+ENDIF()
+SET(LEMON_CXX_WARNING_FLAGS ${CXX_WARNING} CACHE STRING "LEMON warning flags.")
+
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${LEMON_CXX_WARNING_FLAGS}")
+
+SET( CMAKE_CXX_FLAGS_MAINTAINER "-Werror -ggdb" CACHE STRING
+ "Flags used by the C++ compiler during maintainer builds."
+ FORCE )
+SET( CMAKE_C_FLAGS_MAINTAINER "-Werror" CACHE STRING
+ "Flags used by the C compiler during maintainer builds."
+ FORCE )
+SET( CMAKE_EXE_LINKER_FLAGS_MAINTAINER
+ "-Wl,--warn-unresolved-symbols,--warn-once" CACHE STRING
+ "Flags used for linking binaries during maintainer builds."
+ FORCE )
+SET( CMAKE_SHARED_LINKER_FLAGS_MAINTAINER
+ "-Wl,--warn-unresolved-symbols,--warn-once" CACHE STRING
+ "Flags used by the shared libraries linker during maintainer builds."
+ FORCE )
+MARK_AS_ADVANCED(
+ CMAKE_CXX_FLAGS_MAINTAINER
+ CMAKE_C_FLAGS_MAINTAINER
+ CMAKE_EXE_LINKER_FLAGS_MAINTAINER
+ CMAKE_SHARED_LINKER_FLAGS_MAINTAINER )
+
+IF(CMAKE_CONFIGURATION_TYPES)
+ LIST(APPEND CMAKE_CONFIGURATION_TYPES Maintainer)
+ LIST(REMOVE_DUPLICATES CMAKE_CONFIGURATION_TYPES)
+ SET(CMAKE_CONFIGURATION_TYPES "${CMAKE_CONFIGURATION_TYPES}" CACHE STRING
+ "Add the configurations that we need"
+ FORCE)
+ endif()
+
+IF(NOT CMAKE_BUILD_TYPE)
+ SET(CMAKE_BUILD_TYPE "Release")
+ENDIF()
+
+SET( CMAKE_BUILD_TYPE "${CMAKE_BUILD_TYPE}" CACHE STRING
+ "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel Maintainer."
+ FORCE )
+
+
INCLUDE(CheckTypeSize)
CHECK_TYPE_SIZE("long long" LONG_LONG)
SET(LEMON_HAVE_LONG_LONG ${HAVE_LONG_LONG})
@@ -39,6 +118,12 @@
ENABLE_TESTING()
+IF(${CMAKE_BUILD_TYPE} STREQUAL "Maintainer")
+ ADD_CUSTOM_TARGET(check ALL COMMAND ${CMAKE_CTEST_COMMAND})
+ELSE()
+ ADD_CUSTOM_TARGET(check COMMAND ${CMAKE_CTEST_COMMAND})
+ENDIF()
+
ADD_SUBDIRECTORY(lemon)
IF(${CMAKE_SOURCE_DIR} STREQUAL ${PROJECT_SOURCE_DIR})
ADD_SUBDIRECTORY(demo)
@@ -64,7 +149,7 @@
)
ENDIF()
-IF(${CMAKE_SOURCE_DIR} STREQUAL ${PROJECT_SOURCE_DIR} AND WIN32)
+IF(${CMAKE_SOURCE_DIR} STREQUAL ${PROJECT_SOURCE_DIR})
SET(CPACK_PACKAGE_NAME ${PROJECT_NAME})
SET(CPACK_PACKAGE_VENDOR "EGRES")
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -3,6 +3,8 @@
SET(abs_top_srcdir ${PROJECT_SOURCE_DIR})
SET(abs_top_builddir ${PROJECT_BINARY_DIR})
+SET(LEMON_DOC_SOURCE_BROWSER "NO" CACHE STRING "Include source into the doc (YES/NO).")
+
CONFIGURE_FILE(
${PROJECT_SOURCE_DIR}/doc/Doxyfile.in
${PROJECT_BINARY_DIR}/doc/Doxyfile
@@ -52,3 +54,15 @@
ENDIF()
ENDIF()
+
+IF(WGET_FOUND)
+ADD_CUSTOM_TARGET(update-external-tags
+ COMMAND ${CMAKE_COMMAND} -E make_directory dl
+ # COMMAND ${CMAKE_COMMAND} -E copy libstdc++.tag dl
+ COMMAND ${WGET_EXECUTABLE} wget -P dl -N libstdc++.tag.tmp http://gcc.gnu.org/onlinedocs/libstdc++/latest-doxygen/libstdc++.tag
+ COMMAND ${CMAKE_COMMAND} -E rename dl/libstdc++.tag libstdc++.tag
+ COMMAND ${CMAKE_COMMAND} -E remove dl/libstdc++.tag
+ COMMAND ${CMAKE_COMMAND} -E remove_directory dl
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+ )
+ENDIF()
diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -70,7 +70,7 @@
SHOW_FILES = YES
SHOW_NAMESPACES = YES
FILE_VERSION_FILTER =
-LAYOUT_FILE = DoxygenLayout.xml
+LAYOUT_FILE = "@abs_top_srcdir@/doc/DoxygenLayout.xml"
#---------------------------------------------------------------------------
# configuration options related to warning and progress messages
#---------------------------------------------------------------------------
@@ -114,7 +114,7 @@
#---------------------------------------------------------------------------
# configuration options related to source browsing
#---------------------------------------------------------------------------
-SOURCE_BROWSER = NO
+SOURCE_BROWSER = @LEMON_DOC_SOURCE_BROWSER@
INLINE_SOURCES = NO
STRIP_CODE_COMMENTS = YES
REFERENCED_BY_RELATION = NO
@@ -225,7 +225,7 @@
#---------------------------------------------------------------------------
# Options related to the search engine
#---------------------------------------------------------------------------
-TAGFILES = "@abs_top_srcdir@/doc/libstdc++.tag = http://gcc.gnu.org/onlinedocs/libstdc++/latest-doxygen/ "
+TAGFILES = "@abs_top_builddir@/doc/libstdc++.tag = http://gcc.gnu.org/onlinedocs/libstdc++/latest-doxygen/ "
GENERATE_TAGFILE = html/lemon.tag
ALLEXTERNALS = NO
EXTERNAL_GROUPS = NO
diff --git a/lemon/CMakeLists.txt b/lemon/CMakeLists.txt
--- a/lemon/CMakeLists.txt
+++ b/lemon/CMakeLists.txt
@@ -8,6 +8,12 @@
${CMAKE_CURRENT_BINARY_DIR}/config.h
)
+CONFIGURE_FILE(
+ ${CMAKE_CURRENT_SOURCE_DIR}/lemon.pc.cmake
+ ${CMAKE_CURRENT_BINARY_DIR}/lemon.pc
+ @ONLY
+)
+
SET(LEMON_SOURCES
arg_parser.cc
base.cc
@@ -66,3 +72,9 @@
DESTINATION include/lemon
COMPONENT headers
)
+
+INSTALL(
+ FILES ${CMAKE_CURRENT_BINARY_DIR}/lemon.pc
+ DESTINATION lib/pkgconfig
+)
+
diff --git a/lemon/lemon.pc.cmake b/lemon/lemon.pc.cmake
new file mode 100644
--- /dev/null
+++ b/lemon/lemon.pc.cmake
@@ -0,0 +1,10 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=@CMAKE_INSTALL_PREFIX@/bin
+libdir=@CMAKE_INSTALL_PREFIX@/lib
+includedir=@CMAKE_INSTALL_PREFIX@/include
+
+Name: @PROJECT_NAME@
+Description: Library for Efficient Modeling and Optimization in Networks
+Version: @PROJECT_VERSION@
+Libs: -L${libdir} -lemon @GLPK_LIBS@ @CPLEX_LIBS@ @SOPLEX_LIBS@ @CLP_LIBS@ @CBC_LIBS@
+Cflags: -I${includedir}
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -45,7 +45,12 @@
)
IF(LEMON_HAVE_LP)
- ADD_EXECUTABLE(lp_test lp_test.cc)
+ IF(${CMAKE_BUILD_TYPE} STREQUAL "Maintainer")
+ ADD_EXECUTABLE(lp_test lp_test.cc)
+ ELSE()
+ ADD_EXECUTABLE(lp_test EXCLUDE_FROM_ALL lp_test.cc)
+ ENDIF()
+
SET(LP_TEST_LIBS lemon)
IF(LEMON_HAVE_GLPK)
@@ -81,7 +86,12 @@
ENDIF()
IF(LEMON_HAVE_MIP)
- ADD_EXECUTABLE(mip_test mip_test.cc)
+ IF(${CMAKE_BUILD_TYPE} STREQUAL "Maintainer")
+ ADD_EXECUTABLE(mip_test mip_test.cc)
+ ELSE()
+ ADD_EXECUTABLE(mip_test EXCLUDE_FROM_ALL mip_test.cc)
+ ENDIF()
+
SET(MIP_TEST_LIBS lemon)
IF(LEMON_HAVE_GLPK)
@@ -117,7 +127,12 @@
ENDIF()
FOREACH(TEST_NAME ${TESTS})
- ADD_EXECUTABLE(${TEST_NAME} ${TEST_NAME}.cc)
+ IF(${CMAKE_BUILD_TYPE} STREQUAL "Maintainer")
+ ADD_EXECUTABLE(${TEST_NAME} ${TEST_NAME}.cc)
+ ELSE()
+ ADD_EXECUTABLE(${TEST_NAME} EXCLUDE_FROM_ALL ${TEST_NAME}.cc)
+ ENDIF()
TARGET_LINK_LIBRARIES(${TEST_NAME} lemon)
ADD_TEST(${TEST_NAME} ${TEST_NAME})
+ ADD_DEPENDENCIES(check ${TEST_NAME})
ENDFOREACH()
More information about the Lemon-commits
mailing list