LEMON/LEMON-official Changeset - r726:9c7639f3a741

Repositories » LEMON » LEMON-official

Summary
Changelog
Files
Switch To
- loading...
Options
- Lightweight changelog
- Search
Pull Requests

Changeset - r726:9c7639f3a741

« 725:d1e1cd

727:257e91 »

r726:9c7639f3a741

Fri, 29 May 2009 13:44:37

[Not Reviewed]

0 comments (0 inline)

ladanyi@tmit.bme.hu
ladanyi@tmit.bme.hu

Minor CMake improvements * Use the empty ELSE(), ENDIF(), ENDMACRO(), etc. syntax since this improves readability and requires less typing. * Use FIND_PACKAGE() instead of INCLUDE(). * Use the value of CMAKE_COMMAND variable instead of cmake, since this works even if cmake is not in the PATH.

0 6 0

default

6 files changed with 110 insertions and 97 deletions:

CMakeLists.txt

demo/CMakeLists.txt

doc/CMakeLists.txt

lemon/CMakeLists.txt

test/CMakeLists.txt

tools/CMakeLists.txt

↑ Collapse diff ↑

CMakeLists.txt

Show inline comments

@@ -24,4 +24,4 @@
 		INCLUDE(FindDoxygen)
 		INCLUDE(FindGhostscript)
 		FIND_PACKAGE(Doxygen)
 		FIND_PACKAGE(Ghostscript)
 		FIND_PACKAGE(GLPK 4.33)
@@ -42,3 +42,3 @@
 		  ADD_SUBDIRECTORY(test)
-		ENDIF(${CMAKE_SOURCE_DIR} STREQUAL ${PROJECT_SOURCE_DIR})
 		ENDIF()
@@ -59,71 +59,69 @@
+		  )
-		ENDIF(UNIX)
 		ENDIF()
 		IF(${CMAKE_SOURCE_DIR} STREQUAL ${PROJECT_SOURCE_DIR})
 		  IF(WIN32)
 		    SET(CPACK_PACKAGE_NAME ${PROJECT_NAME})
 		    SET(CPACK_PACKAGE_VENDOR "EGRES")
 		    SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY
 		      "LEMON - Library for Efficient Modeling and Optimization in Networks")
-		    SET(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
+		IF(${CMAKE_SOURCE_DIR} STREQUAL ${PROJECT_SOURCE_DIR} AND WIN32)
 		  SET(CPACK_PACKAGE_NAME ${PROJECT_NAME})
 		  SET(CPACK_PACKAGE_VENDOR "EGRES")
 		  SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY
 		    "LEMON - Library for Efficient Modeling and Optimization in Networks")
 		  SET(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
-		    SET(CPACK_PACKAGE_VERSION ${PROJECT_VERSION})
 		  SET(CPACK_PACKAGE_VERSION ${PROJECT_VERSION})
 		    SET(CPACK_PACKAGE_INSTALL_DIRECTORY
 		      "${PROJECT_NAME} ${PROJECT_VERSION}")
 		    SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY
 		      "${PROJECT_NAME} ${PROJECT_VERSION}")
 		  SET(CPACK_PACKAGE_INSTALL_DIRECTORY
 		    "${PROJECT_NAME} ${PROJECT_VERSION}")
 		  SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY
 		    "${PROJECT_NAME} ${PROJECT_VERSION}")
-		    SET(CPACK_COMPONENTS_ALL headers library html_documentation bin)
 		  SET(CPACK_COMPONENTS_ALL headers library html_documentation bin)
 		    SET(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "C++ headers")
 		    SET(CPACK_COMPONENT_LIBRARY_DISPLAY_NAME "Dynamic-link library")
 		    SET(CPACK_COMPONENT_BIN_DISPLAY_NAME "Command line utilities")
 		    SET(CPACK_COMPONENT_HTML_DOCUMENTATION_DISPLAY_NAME "HTML documentation")
 		  SET(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "C++ headers")
 		  SET(CPACK_COMPONENT_LIBRARY_DISPLAY_NAME "Dynamic-link library")
 		  SET(CPACK_COMPONENT_BIN_DISPLAY_NAME "Command line utilities")
 		  SET(CPACK_COMPONENT_HTML_DOCUMENTATION_DISPLAY_NAME "HTML documentation")
 		    SET(CPACK_COMPONENT_HEADERS_DESCRIPTION
 		      "C++ header files")
 		    SET(CPACK_COMPONENT_LIBRARY_DESCRIPTION
 		      "DLL and import library")
 		    SET(CPACK_COMPONENT_BIN_DESCRIPTION
 		      "Command line utilities")
 		    SET(CPACK_COMPONENT_HTML_DOCUMENTATION_DESCRIPTION
 		      "Doxygen generated documentation")
 		  SET(CPACK_COMPONENT_HEADERS_DESCRIPTION
 		    "C++ header files")
 		  SET(CPACK_COMPONENT_LIBRARY_DESCRIPTION
 		    "DLL and import library")
 		  SET(CPACK_COMPONENT_BIN_DESCRIPTION
 		    "Command line utilities")
 		  SET(CPACK_COMPONENT_HTML_DOCUMENTATION_DESCRIPTION
 		    "Doxygen generated documentation")
-		    SET(CPACK_COMPONENT_HEADERS_DEPENDS library)
 		  SET(CPACK_COMPONENT_HEADERS_DEPENDS library)
 		    SET(CPACK_COMPONENT_HEADERS_GROUP "Development")
 		    SET(CPACK_COMPONENT_LIBRARY_GROUP "Development")
-		    SET(CPACK_COMPONENT_HTML_DOCUMENTATION_GROUP "Documentation")
+		  SET(CPACK_COMPONENT_HEADERS_GROUP "Development")
 		  SET(CPACK_COMPONENT_LIBRARY_GROUP "Development")
 		  SET(CPACK_COMPONENT_HTML_DOCUMENTATION_GROUP "Documentation")
 		    SET(CPACK_COMPONENT_GROUP_DEVELOPMENT_DESCRIPTION
 		      "Components needed to develop software using LEMON")
 		    SET(CPACK_COMPONENT_GROUP_DOCUMENTATION_DESCRIPTION
 		      "Documentation of LEMON")
 		  SET(CPACK_COMPONENT_GROUP_DEVELOPMENT_DESCRIPTION
 		    "Components needed to develop software using LEMON")
 		  SET(CPACK_COMPONENT_GROUP_DOCUMENTATION_DESCRIPTION
 		    "Documentation of LEMON")
-		    SET(CPACK_ALL_INSTALL_TYPES Full Developer)
 		  SET(CPACK_ALL_INSTALL_TYPES Full Developer)
 		    SET(CPACK_COMPONENT_HEADERS_INSTALL_TYPES Developer Full)
 		    SET(CPACK_COMPONENT_LIBRARY_INSTALL_TYPES Developer Full)
-		    SET(CPACK_COMPONENT_HTML_DOCUMENTATION_INSTALL_TYPES Full)
+		  SET(CPACK_COMPONENT_HEADERS_INSTALL_TYPES Developer Full)
 		  SET(CPACK_COMPONENT_LIBRARY_INSTALL_TYPES Developer Full)
 		  SET(CPACK_COMPONENT_HTML_DOCUMENTATION_INSTALL_TYPES Full)
 		    SET(CPACK_GENERATOR "NSIS")
 		    SET(CPACK_NSIS_MUI_ICON "${PROJECT_SOURCE_DIR}/cmake/nsis/lemon.ico")
 		    SET(CPACK_NSIS_MUI_UNIICON "${PROJECT_SOURCE_DIR}/cmake/nsis/uninstall.ico")
 		    #SET(CPACK_PACKAGE_ICON "${PROJECT_SOURCE_DIR}/cmake/nsis\\\\installer.bmp")
 		    SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\lemon.ico")
 		    SET(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY} ${PROJECT_NAME}")
 		    SET(CPACK_NSIS_HELP_LINK "http:\\\\\\\\lemon.cs.elte.hu")
 		    SET(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\lemon.cs.elte.hu")
 		    SET(CPACK_NSIS_CONTACT "lemon-user@lemon.cs.elte.hu")
 		    SET(CPACK_NSIS_CREATE_ICONS_EXTRA "
 		      CreateShortCut \\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Documentation.lnk\\\" \\\"$INSTDIR\\\\share\\\\doc\\\\index.html\\\"
 		      ")
 		    SET(CPACK_NSIS_DELETE_ICONS_EXTRA "
 		      !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP
 		      Delete \\\"$SMPROGRAMS\\\\$MUI_TEMP\\\\Documentation.lnk\\\"
 		      ")
 		  SET(CPACK_GENERATOR "NSIS")
 		  SET(CPACK_NSIS_MUI_ICON "${PROJECT_SOURCE_DIR}/cmake/nsis/lemon.ico")
 		  SET(CPACK_NSIS_MUI_UNIICON "${PROJECT_SOURCE_DIR}/cmake/nsis/uninstall.ico")
 		  #SET(CPACK_PACKAGE_ICON "${PROJECT_SOURCE_DIR}/cmake/nsis\\\\installer.bmp")
 		  SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\lemon.ico")
 		  SET(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY} ${PROJECT_NAME}")
 		  SET(CPACK_NSIS_HELP_LINK "http:\\\\\\\\lemon.cs.elte.hu")
 		  SET(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\lemon.cs.elte.hu")
 		  SET(CPACK_NSIS_CONTACT "lemon-user@lemon.cs.elte.hu")
 		  SET(CPACK_NSIS_CREATE_ICONS_EXTRA "
 		    CreateShortCut \\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Documentation.lnk\\\" \\\"$INSTDIR\\\\share\\\\doc\\\\index.html\\\"
 		    ")
 		  SET(CPACK_NSIS_DELETE_ICONS_EXTRA "
 		    !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP
 		    Delete \\\"$SMPROGRAMS\\\\$MUI_TEMP\\\\Documentation.lnk\\\"
 		    ")
 		    INCLUDE(CPack)
 		  ENDIF(WIN32)
-		ENDIF(${CMAKE_SOURCE_DIR} STREQUAL ${PROJECT_SOURCE_DIR})
+		  INCLUDE(CPack)
 		ENDIF()

demo/CMakeLists.txt

Show inline comments

@@ -5,3 +5,5 @@
-		LINK_DIRECTORIES(${PROJECT_BINARY_DIR}/lemon)
 		LINK_DIRECTORIES(
 		  ${PROJECT_BINARY_DIR}/lemon
+		)
@@ -10,3 +12,4 @@
 		  graph_to_eps_demo
-		  lgf_demo)
 		  lgf_demo
+		)
@@ -15,2 +18,2 @@
 		  TARGET_LINK_LIBRARIES(${DEMO_NAME} lemon)
-		ENDFOREACH(DEMO_NAME)
 		ENDFOREACH()

doc/CMakeLists.txt

Show inline comments

@@ -48,4 +48,4 @@
+		    )
-		  ENDIF(UNIX)
 		  ENDIF()
-		ENDIF(DOXYGEN_EXECUTABLE AND GHOSTSCRIPT_EXECUTABLE)
 		ENDIF()

lemon/CMakeLists.txt

Show inline comments

@@ -27,4 +27,4 @@
 		    INSTALL(FILES ${GLPK_BIN_DIR}/zlib1.dll DESTINATION bin)
 		  ENDIF(WIN32)
 		ENDIF(LEMON_HAVE_GLPK)
 		  ENDIF()
 		ENDIF()
@@ -33,3 +33,3 @@
 		  INCLUDE_DIRECTORIES(${CPLEX_INCLUDE_DIRS})
-		ENDIF(LEMON_HAVE_CPLEX)
 		ENDIF()
@@ -38,3 +38,3 @@
 		  INCLUDE_DIRECTORIES(${COIN_INCLUDE_DIRS})
-		ENDIF(LEMON_HAVE_CLP)
 		ENDIF()
@@ -43,3 +43,3 @@
 		  INCLUDE_DIRECTORIES(${COIN_INCLUDE_DIRS})
-		ENDIF(LEMON_HAVE_CBC)
 		ENDIF()
@@ -48,3 +48,3 @@
 		  SET_TARGET_PROPERTIES(lemon PROPERTIES OUTPUT_NAME emon)
-		ENDIF(UNIX)
 		ENDIF()

test/CMakeLists.txt

Show inline comments

@@ -5,3 +5,5 @@
-		LINK_DIRECTORIES(${PROJECT_BINARY_DIR}/lemon)
 		LINK_DIRECTORIES(
 		  ${PROJECT_BINARY_DIR}/lemon
+		)
@@ -37,3 +39,4 @@
 		  time_measure_test
-		  unionfind_test)
 		  unionfind_test
+		)
@@ -42,11 +45,13 @@
 		  SET(LP_TEST_LIBS lemon)
 		  IF(LEMON_HAVE_GLPK)
 		    SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${GLPK_LIBRARIES})
-		  ENDIF(LEMON_HAVE_GLPK)
 		  ENDIF()
 		  IF(LEMON_HAVE_CPLEX)
 		    SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${CPLEX_LIBRARIES})
-		  ENDIF(LEMON_HAVE_CPLEX)
 		  ENDIF()
 		  IF(LEMON_HAVE_CLP)
 		    SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${COIN_CLP_LIBRARIES})
-		  ENDIF(LEMON_HAVE_CLP)
 		  ENDIF()
 		  TARGET_LINK_LIBRARIES(lp_test ${LP_TEST_LIBS})
@@ -58,7 +63,8 @@
 		    ADD_CUSTOM_COMMAND(TARGET lp_test POST_BUILD
 		      COMMAND cmake -E copy ${GLPK_BIN_DIR}/glpk.dll ${TARGET_PATH}
 		      COMMAND cmake -E copy ${GLPK_BIN_DIR}/libltdl3.dll ${TARGET_PATH}
-		      COMMAND cmake -E copy ${GLPK_BIN_DIR}/zlib1.dll ${TARGET_PATH}
+		      COMMAND ${CMAKE_COMMAND} -E copy ${GLPK_BIN_DIR}/glpk.dll ${TARGET_PATH}
 		      COMMAND ${CMAKE_COMMAND} -E copy ${GLPK_BIN_DIR}/libltdl3.dll ${TARGET_PATH}
 		      COMMAND ${CMAKE_COMMAND} -E copy ${GLPK_BIN_DIR}/zlib1.dll ${TARGET_PATH}
+		    )
-		  ENDIF(WIN32 AND LEMON_HAVE_GLPK)
 		  ENDIF()
 		  IF(WIN32 AND LEMON_HAVE_CPLEX)
@@ -67,6 +73,6 @@
 		    ADD_CUSTOM_COMMAND(TARGET lp_test POST_BUILD
-		      COMMAND cmake -E copy ${CPLEX_BIN_DIR}/cplex91.dll ${TARGET_PATH}
+		      COMMAND ${CMAKE_COMMAND} -E copy ${CPLEX_BIN_DIR}/cplex91.dll ${TARGET_PATH}
+		    )
 		  ENDIF(WIN32 AND LEMON_HAVE_CPLEX)
 		ENDIF(LEMON_HAVE_LP)
 		  ENDIF()
 		ENDIF()
@@ -75,11 +81,13 @@
 		  SET(MIP_TEST_LIBS lemon)
 		  IF(LEMON_HAVE_GLPK)
 		    SET(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${GLPK_LIBRARIES})
-		  ENDIF(LEMON_HAVE_GLPK)
 		  ENDIF()
 		  IF(LEMON_HAVE_CPLEX)
 		    SET(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${CPLEX_LIBRARIES})
-		  ENDIF(LEMON_HAVE_CPLEX)
 		  ENDIF()
 		  IF(LEMON_HAVE_CBC)
 		    SET(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${COIN_CBC_LIBRARIES})
-		  ENDIF(LEMON_HAVE_CBC)
 		  ENDIF()
 		  TARGET_LINK_LIBRARIES(mip_test ${MIP_TEST_LIBS})
@@ -91,7 +99,8 @@
 		    ADD_CUSTOM_COMMAND(TARGET mip_test POST_BUILD
 		      COMMAND cmake -E copy ${GLPK_BIN_DIR}/glpk.dll ${TARGET_PATH}
 		      COMMAND cmake -E copy ${GLPK_BIN_DIR}/libltdl3.dll ${TARGET_PATH}
-		      COMMAND cmake -E copy ${GLPK_BIN_DIR}/zlib1.dll ${TARGET_PATH}
+		      COMMAND ${CMAKE_COMMAND} -E copy ${GLPK_BIN_DIR}/glpk.dll ${TARGET_PATH}
 		      COMMAND ${CMAKE_COMMAND} -E copy ${GLPK_BIN_DIR}/libltdl3.dll ${TARGET_PATH}
 		      COMMAND ${CMAKE_COMMAND} -E copy ${GLPK_BIN_DIR}/zlib1.dll ${TARGET_PATH}
+		    )
-		  ENDIF(WIN32 AND LEMON_HAVE_GLPK)
 		  ENDIF()
 		  IF(WIN32 AND LEMON_HAVE_CPLEX)
@@ -100,6 +109,6 @@
 		    ADD_CUSTOM_COMMAND(TARGET mip_test POST_BUILD
-		      COMMAND cmake -E copy ${CPLEX_BIN_DIR}/cplex91.dll ${TARGET_PATH}
+		      COMMAND ${CMAKE_COMMAND} -E copy ${CPLEX_BIN_DIR}/cplex91.dll ${TARGET_PATH}
+		    )
 		  ENDIF(WIN32 AND LEMON_HAVE_CPLEX)
 		ENDIF(LEMON_HAVE_MIP)
 		  ENDIF()
 		ENDIF()
@@ -109,2 +118,2 @@
 		  ADD_TEST(${TEST_NAME} ${TEST_NAME})
-		ENDFOREACH(TEST_NAME)
 		ENDFOREACH()

tools/CMakeLists.txt

Show inline comments

@@ -5,3 +5,5 @@
-		LINK_DIRECTORIES(${PROJECT_BINARY_DIR}/lemon)
 		LINK_DIRECTORIES(
 		  ${PROJECT_BINARY_DIR}/lemon
+		)
@@ -26,3 +28,4 @@
 		    DESTINATION bin
 		    COMPONENT bin)
 		ENDIF(NOT WIN32)
 		    COMPONENT bin
+		  )
 		ENDIF()

0 comments (0 inline)

RhodeCode

Login to your account