Ticket #658: 76253ddee3ce.patch

CMakeLists.txt

@@ -1 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+cmake_minimum_required(VERSION 2.8)
 
-IF(POLICY CMP0048) 
-  CMAKE_POLICY(SET CMP0048 OLD) 
-ENDIF(POLICY CMP0048)
+if(POLICY CMP0048) 
+  cmake_policy(SET CMP0048 OLD) 
+endif(POLICY CMP0048)
 
-IF(POLICY CMP0043) 
-  CMAKE_POLICY(SET CMP0043 NEW)
-ENDIF(POLICY CMP0043)
+if(POLICY CMP0043) 
+  cmake_policy(SET CMP0043 NEW)
+endif(POLICY CMP0043)
 
-IF(POLICY CMP0026)
+if(POLICY CMP0026)
   #This is for copying the dll's needed by glpk (in lp_test and mip_test)
-  CMAKE_POLICY(SET CMP0026 NEW)
-ENDIF(POLICY CMP0026)
+  cmake_policy(SET CMP0026 NEW)
+endif(POLICY CMP0026)
 
-SET(PROJECT_NAME "LEMON")
-PROJECT(${PROJECT_NAME})
+set(PROJECT_NAME "LEMON")
+project(${PROJECT_NAME})
 
-INCLUDE(FindPythonInterp)
-INCLUDE(FindWget)
+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(
+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
     hg log -r. --template "{latesttag}"
     WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
@@ -32 +32 @@
     ERROR_QUIET
     OUTPUT_STRIP_TRAILING_WHITESPACE
   )
-  EXECUTE_PROCESS(
+  execute_process(
     COMMAND
     hg log -r. --template "{latesttagdistance}"
     WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
@@ -40 +40 @@
     ERROR_QUIET
     OUTPUT_STRIP_TRAILING_WHITESPACE
   )
-  EXECUTE_PROCESS(
+  execute_process(
     COMMAND
     hg log -r. --template "{node|short}"
     WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
@@ -49 +49 @@
     OUTPUT_STRIP_TRAILING_WHITESPACE
   )
 
-  IF(HG_REVISION_TAG STREQUAL "")
-    SET(HG_REVISION_ID "hg-tip")
-  ELSE()
-    IF(HG_REVISION_TAG STREQUAL "null")
-      SET(HG_REVISION_TAG "trunk")
-    ELSEIF(HG_REVISION_TAG MATCHES "^r")
-      STRING(SUBSTRING ${HG_REVISION_TAG} 1 -1 HG_REVISION_TAG)
-    ENDIF()
-    IF(HG_REVISION_DIST STREQUAL "0")
-      SET(HG_REVISION ${HG_REVISION_TAG})
-    ELSE()
-      SET(HG_REVISION
+  if(HG_REVISION_TAG STREQUAL "")
+    set(HG_REVISION_ID "hg-tip")
+  else()
+    if(HG_REVISION_TAG STREQUAL "null")
+      set(HG_REVISION_TAG "trunk")
+    elseif(HG_REVISION_TAG MATCHES "^r")
+      string(SUBSTRING ${HG_REVISION_TAG} 1 -1 HG_REVISION_TAG)
+    endif()
+    if(HG_REVISION_DIST STREQUAL "0")
+      set(HG_REVISION ${HG_REVISION_TAG})
+    else()
+      set(HG_REVISION
         "${HG_REVISION_TAG}+${HG_REVISION_DIST}-${HG_REVISION_ID}")
-    ENDIF()
-  ENDIF()
+    endif()
+  endif()
 
-  SET(LEMON_VERSION ${HG_REVISION} CACHE STRING "LEMON version string.")
-ENDIF()
+  set(LEMON_VERSION ${HG_REVISION} CACHE STRING "LEMON version string.")
+endif()
 
-SET(PROJECT_VERSION ${LEMON_VERSION})
+set(PROJECT_VERSION ${LEMON_VERSION})
 
-SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
+set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
 
-FIND_PACKAGE(Doxygen)
-FIND_PACKAGE(Ghostscript)
+find_package(Doxygen)
+find_package(Ghostscript)
 
-IF(WIN32)
-  SET(LEMON_WIN32 TRUE)
-ENDIF(WIN32)
+if(WIN32)
+  set(LEMON_WIN32 TRUE)
+endif(WIN32)
 
-SET(LEMON_ENABLE_GLPK YES CACHE STRING "Enable GLPK solver backend.")
-SET(LEMON_ENABLE_ILOG YES CACHE STRING "Enable ILOG (CPLEX) solver backend.")
-SET(LEMON_ENABLE_COIN YES CACHE STRING "Enable COIN solver backend.")
-SET(LEMON_ENABLE_SOPLEX YES CACHE STRING "Enable SoPlex solver backend.")
+set(LEMON_ENABLE_GLPK YES CACHE STRING "Enable GLPK solver backend.")
+set(LEMON_ENABLE_ILOG YES CACHE STRING "Enable ILOG (CPLEX) solver backend.")
+set(LEMON_ENABLE_COIN YES CACHE STRING "Enable COIN solver backend.")
+set(LEMON_ENABLE_SOPLEX YES CACHE STRING "Enable SoPlex solver backend.")
 
-IF(LEMON_ENABLE_GLPK) 
-  FIND_PACKAGE(GLPK 4.33)
-  IF(GLPK_FOUND)
-    SET(LEMON_HAVE_LP TRUE)
-    SET(LEMON_HAVE_MIP TRUE)
-    SET(LEMON_HAVE_GLPK TRUE)
-  ENDIF(GLPK_FOUND)
-ENDIF(LEMON_ENABLE_GLPK)
-IF(LEMON_ENABLE_ILOG)
-  FIND_PACKAGE(ILOG)
-  IF(ILOG_FOUND)
-    SET(LEMON_HAVE_LP TRUE)
-    SET(LEMON_HAVE_MIP TRUE)
-    SET(LEMON_HAVE_CPLEX TRUE)
-  ENDIF(ILOG_FOUND)
-ENDIF(LEMON_ENABLE_ILOG)
-IF(LEMON_ENABLE_COIN)
-  FIND_PACKAGE(COIN)
-  IF(COIN_FOUND)
-    SET(LEMON_HAVE_LP TRUE)
-    SET(LEMON_HAVE_MIP TRUE)
-    SET(LEMON_HAVE_CLP TRUE)
-    SET(LEMON_HAVE_CBC TRUE)
-  ENDIF(COIN_FOUND)
-ENDIF(LEMON_ENABLE_COIN)
-IF(LEMON_ENABLE_SOPLEX)
-  FIND_PACKAGE(SOPLEX)
-  IF(SOPLEX_FOUND)
-    SET(LEMON_HAVE_LP TRUE)
-    SET(LEMON_HAVE_SOPLEX TRUE)
-  ENDIF(SOPLEX_FOUND)
-ENDIF(LEMON_ENABLE_SOPLEX)
+if(LEMON_ENABLE_GLPK) 
+  find_package(GLPK 4.33)
+  if(GLPK_FOUND)
+    set(LEMON_HAVE_LP TRUE)
+    set(LEMON_HAVE_MIP TRUE)
+    set(LEMON_HAVE_GLPK TRUE)
+  endif(GLPK_FOUND)
+endif(LEMON_ENABLE_GLPK)
+if(LEMON_ENABLE_ILOG)
+  find_package(ILOG)
+  if(ILOG_FOUND)
+    set(LEMON_HAVE_LP TRUE)
+    set(LEMON_HAVE_MIP TRUE)
+    set(LEMON_HAVE_CPLEX TRUE)
+  endif(ILOG_FOUND)
+endif(LEMON_ENABLE_ILOG)
+if(LEMON_ENABLE_COIN)
+  find_package(COIN)
+  if(COIN_FOUND)
+    set(LEMON_HAVE_LP TRUE)
+    set(LEMON_HAVE_MIP TRUE)
+    set(LEMON_HAVE_CLP TRUE)
+    set(LEMON_HAVE_CBC TRUE)
+  endif(COIN_FOUND)
+endif(LEMON_ENABLE_COIN)
+if(LEMON_ENABLE_SOPLEX)
+  find_package(SOPLEX)
+  if(SOPLEX_FOUND)
+    set(LEMON_HAVE_LP TRUE)
+    set(LEMON_HAVE_SOPLEX TRUE)
+  endif(SOPLEX_FOUND)
+endif(LEMON_ENABLE_SOPLEX)
 
-IF(ILOG_FOUND)
-  SET(DEFAULT_LP "CPLEX")
-  SET(DEFAULT_MIP "CPLEX")
-ELSEIF(COIN_FOUND)
-  SET(DEFAULT_LP "CLP")
-  SET(DEFAULT_MIP "CBC")
-ELSEIF(GLPK_FOUND)
-  SET(DEFAULT_LP "GLPK")
-  SET(DEFAULT_MIP "GLPK")
-ELSEIF(SOPLEX_FOUND)
-  SET(DEFAULT_LP "SOPLEX")
-ENDIF()
+if(ILOG_FOUND)
+  set(DEFAULT_LP "CPLEX")
+  set(DEFAULT_MIP "CPLEX")
+elseif(COIN_FOUND)
+  set(DEFAULT_LP "CLP")
+  set(DEFAULT_MIP "CBC")
+elseif(GLPK_FOUND)
+  set(DEFAULT_LP "GLPK")
+  set(DEFAULT_MIP "GLPK")
+elseif(SOPLEX_FOUND)
+  set(DEFAULT_LP "SOPLEX")
+endif()
 
-IF(NOT LEMON_DEFAULT_LP OR
+if(NOT LEMON_DEFAULT_LP OR
     (NOT ILOG_FOUND AND (LEMON_DEFAULT_LP STREQUAL "CPLEX")) OR
     (NOT COIN_FOUND AND (LEMON_DEFAULT_LP STREQUAL "CLP")) OR
     (NOT GLPK_FOUND AND (LEMON_DEFAULT_LP STREQUAL "GLPK")) OR
     (NOT SOPLEX_FOUND AND (LEMON_DEFAULT_LP STREQUAL "SOPLEX")))
-  SET(LEMON_DEFAULT_LP ${DEFAULT_LP} CACHE STRING
+  set(LEMON_DEFAULT_LP ${DEFAULT_LP} CACHE STRING
     "Default LP solver backend (GLPK, CPLEX, CLP or SOPLEX)" FORCE)
-ELSE()
-  SET(LEMON_DEFAULT_LP ${DEFAULT_LP} CACHE STRING
+else()
+  set(LEMON_DEFAULT_LP ${DEFAULT_LP} CACHE STRING
     "Default LP solver backend (GLPK, CPLEX, CLP or SOPLEX)")
-ENDIF()
-IF(NOT LEMON_DEFAULT_MIP OR
+endif()
+if(NOT LEMON_DEFAULT_MIP OR
     (NOT ILOG_FOUND AND (LEMON_DEFAULT_MIP STREQUAL "CPLEX")) OR
     (NOT COIN_FOUND AND (LEMON_DEFAULT_MIP STREQUAL "CBC")) OR
     (NOT GLPK_FOUND AND (LEMON_DEFAULT_MIP STREQUAL "GLPK")))
-  SET(LEMON_DEFAULT_MIP ${DEFAULT_MIP} CACHE STRING
+  set(LEMON_DEFAULT_MIP ${DEFAULT_MIP} CACHE STRING
     "Default MIP solver backend (GLPK, CPLEX or CBC)" FORCE)
-ELSE()
-  SET(LEMON_DEFAULT_MIP ${DEFAULT_MIP} CACHE STRING
+else()
+  set(LEMON_DEFAULT_MIP ${DEFAULT_MIP} CACHE STRING
     "Default MIP solver backend (GLPK, CPLEX or CBC)")
-ENDIF()
+endif()
 
-IF( ( ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") AND
+if( ( ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") AND
       ("${CMAKE_CXX_COMPILER_VERSION}" VERSION_GREATER_EQUAL "4.8") )
     OR ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
     OR ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
     )
-  SET(LEMON_NO_UNUSED_LOCAL_TYPEDEF_WARNINGS TRUE)
-ENDIF()
+  set(LEMON_NO_UNUSED_LOCAL_TYPEDEF_WARNINGS TRUE)
+endif()
 
-IF(DEFINED ENV{LEMON_CXX_WARNING})
-  SET(CXX_WARNING $ENV{LEMON_CXX_WARNING})
-ELSE()
-  IF( ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+if(DEFINED ENV{LEMON_CXX_WARNING})
+  set(CXX_WARNING $ENV{LEMON_CXX_WARNING})
+else()
+  if( ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
       OR ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
       )
-    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 -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("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
-    SET(CXX_WARNING "-Wall -W -Wunused -Wformat=2 -Wnon-virtual-dtor -Wno-char-subscripts -Wwrite-strings -Wno-char-subscripts -Wreturn-type -Wcast-qual -Wsign-promo -Woverloaded-virtual -fno-strict-aliasing -Wno-unknown-pragmas")
-    SET(CMAKE_CXX_FLAGS_DEBUG CACHE STRING "-ggdb")
-    SET(CMAKE_C_FLAGS_DEBUG CACHE STRING "-ggdb")
-  ELSEIF(MSVC)
+    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 -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("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
+    set(CXX_WARNING "-Wall -W -Wunused -Wformat=2 -Wnon-virtual-dtor -Wno-char-subscripts -Wwrite-strings -Wno-char-subscripts -Wreturn-type -Wcast-qual -Wsign-promo -Woverloaded-virtual -fno-strict-aliasing -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 kept as an example.
 
-    # SET(CXX_WARNING "/wd4250 /wd4267 /wd4355 /wd4503 /wd4800 /wd4996")
+    # set(CXX_WARNING "/wd4250 /wd4267 /wd4355 /wd4503 /wd4800 /wd4996")
 
     # Suppressed warnings:
     # C4250: 'class1' : inherits 'class2::member' via dominance
@@ -187 +187 @@
     # C4800: 'type' : forcing value to bool 'true' or 'false'
     #        (performance warning)
     # C4996: 'function': was declared deprecated
-  ELSE()
-    SET(CXX_WARNING "-Wall")
-  ENDIF()
-ENDIF()
-SET(LEMON_CXX_WARNING_FLAGS ${CXX_WARNING} CACHE STRING "LEMON warning flags.")
+  else()
+    set(CXX_WARNING "-Wall")
+  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 "${CMAKE_CXX_FLAGS} ${LEMON_CXX_WARNING_FLAGS}")
 
-IF(MSVC)
-  SET( CMAKE_CXX_FLAGS "/bigobj ${CMAKE_CXX_FLAGS}")
-  SET( CMAKE_CXX_FLAGS_MAINTAINER "/WX ${CMAKE_CXX_FLAGS_DEBUG}" CACHE STRING
+if(MSVC)
+  set( CMAKE_CXX_FLAGS "/bigobj ${CMAKE_CXX_FLAGS}")
+  set( CMAKE_CXX_FLAGS_MAINTAINER "/WX ${CMAKE_CXX_FLAGS_DEBUG}" CACHE STRING
     "Flags used by the C++ compiler during maintainer builds." FORCE
     )
-  SET( CMAKE_C_FLAGS_MAINTAINER "/WX ${CMAKE_CXX_FLAGS_DEBUG}" CACHE STRING
+  set( CMAKE_C_FLAGS_MAINTAINER "/WX ${CMAKE_CXX_FLAGS_DEBUG}" CACHE STRING
     "Flags used by the C compiler during maintainer builds." FORCE
     )
-  SET( CMAKE_EXE_LINKER_FLAGS_MAINTAINER
+  set( CMAKE_EXE_LINKER_FLAGS_MAINTAINER
     "${CMAKE_EXE_LINKER_FLAGS_DEBUG}" CACHE STRING
     "Flags used for linking binaries during maintainer builds." FORCE
     )
-  SET( CMAKE_SHARED_LINKER_FLAGS_MAINTAINER
+  set( CMAKE_SHARED_LINKER_FLAGS_MAINTAINER
     "${CMAKE_SHARED_LINKER_FLAGS_DEBUG}" CACHE STRING
     "Flags used by the shared libraries linker during maintainer builds."
      FORCE
     )
-ELSE()
-  SET( CMAKE_CXX_FLAGS_MAINTAINER "-Werror -ggdb -O0" CACHE STRING
+else()
+  set( CMAKE_CXX_FLAGS_MAINTAINER "-Werror -ggdb -O0" CACHE STRING
     "Flags used by the C++ compiler during maintainer builds." FORCE
     )
-  SET( CMAKE_C_FLAGS_MAINTAINER "-Werror -O0" CACHE STRING
+  set( CMAKE_C_FLAGS_MAINTAINER "-Werror -O0" CACHE STRING
     "Flags used by the C compiler during maintainer builds." FORCE
     )
-  SET( CMAKE_EXE_LINKER_FLAGS_MAINTAINER
+  set( CMAKE_EXE_LINKER_FLAGS_MAINTAINER
     "${CMAKE_EXE_LINKER_FLAGS_DEBUG}" CACHE STRING
     "Flags used for linking binaries during maintainer builds." FORCE
     )
-  SET( CMAKE_SHARED_LINKER_FLAGS_MAINTAINER
+  set( CMAKE_SHARED_LINKER_FLAGS_MAINTAINER
     "${CMAKE_SHARED_LINKER_FLAGS_DEBUG}" CACHE STRING
     "Flags used by the shared libraries linker during maintainer builds." FORCE)
-ENDIF()
+endif()
 
-MARK_AS_ADVANCED(
+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
+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()
+if(NOT CMAKE_BUILD_TYPE)
+  set(CMAKE_BUILD_TYPE "Release")
+endif()
 
-SET( CMAKE_BUILD_TYPE "${CMAKE_BUILD_TYPE}" CACHE STRING
+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 )
 
-SET_DIRECTORY_PROPERTIES(PROPERTIES
+set_directory_properties(PROPERTIES
   COMPILE_DEFINITIONS
   $<$<OR:$<CONFIG:Debug>,$<CONFIG:Maintainer>>:LEMON_ENABLE_DEBUG>
 )
 
-INCLUDE(CheckTypeSize)
+include(CheckTypeSize)
 CHECK_TYPE_SIZE("long long" LONG_LONG)
-SET(LEMON_HAVE_LONG_LONG ${HAVE_LONG_LONG})
+set(LEMON_HAVE_LONG_LONG ${HAVE_LONG_LONG})
 
-INCLUDE(FindThreads)
+include(FindThreads)
 
-IF(NOT LEMON_THREADING)
-  IF(CMAKE_USE_PTHREADS_INIT)
-    SET(LEMON_THREADING "Pthread")
-  ELSEIF(CMAKE_USE_WIN32_THREADS_INIT)
-    SET(LEMON_THREADING "Win32")
-  ELSE()
-    SET(LEMON_THREADING "None")
-  ENDIF()
-ENDIF()
+if(NOT LEMON_THREADING)
+  if(CMAKE_USE_PTHREADS_INIT)
+    set(LEMON_THREADING "Pthread")
+  elseif(CMAKE_USE_WIN32_THREADS_INIT)
+    set(LEMON_THREADING "Win32")
+  else()
+    set(LEMON_THREADING "None")
+  endif()
+endif()
 
-SET( LEMON_THREADING "${LEMON_THREADING}" CACHE STRING
+set( LEMON_THREADING "${LEMON_THREADING}" CACHE STRING
   "Choose the threading library, options are: Pthread Win32 None."
   FORCE )
 
-IF(LEMON_THREADING STREQUAL "Pthread")
-  SET(LEMON_USE_PTHREAD TRUE)
-ELSEIF(LEMON_THREADING STREQUAL "Win32")
-  SET(LEMON_USE_WIN32_THREADS TRUE)
-ENDIF()
+if(LEMON_THREADING STREQUAL "Pthread")
+  set(LEMON_USE_PTHREAD TRUE)
+elseif(LEMON_THREADING STREQUAL "Win32")
+  set(LEMON_USE_WIN32_THREADS TRUE)
+endif()
 
-ENABLE_TESTING()
+enable_testing()
 
 
-INCLUDE(CheckCXXCompilerFlag)
+include(CheckCXXCompilerFlag)
 CHECK_CXX_COMPILER_FLAG("-std=c++11" LEMON_CXX11)
-IF(LEMON_CXX11)
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-ENDIF()
+if(LEMON_CXX11)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+endif()
 
 
-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()
+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(contrib)
-  ADD_SUBDIRECTORY(demo)
-  ADD_SUBDIRECTORY(tools)
-  ADD_SUBDIRECTORY(doc)
-  ADD_SUBDIRECTORY(test)
-ENDIF()
+add_subdirectory(lemon)
+if(${CMAKE_SOURCE_DIR} STREQUAL ${PROJECT_SOURCE_DIR})
+  add_subdirectory(contrib)
+  add_subdirectory(demo)
+  add_subdirectory(tools)
+  add_subdirectory(doc)
+  add_subdirectory(test)
+endif()
 
-CONFIGURE_FILE(
+configure_file(
   ${PROJECT_SOURCE_DIR}/cmake/LEMONConfig.cmake.in
   ${PROJECT_BINARY_DIR}/cmake/LEMONConfig.cmake
   @ONLY
 )
-IF(UNIX)
-  INSTALL(
+if(UNIX)
+  install(
     FILES ${PROJECT_BINARY_DIR}/cmake/LEMONConfig.cmake
     DESTINATION share/lemon/cmake
   )
-ELSEIF(WIN32)
-  INSTALL(
+elseif(WIN32)
+  install(
     FILES ${PROJECT_BINARY_DIR}/cmake/LEMONConfig.cmake
     DESTINATION cmake
   )
-ENDIF()
+endif()
 
-CONFIGURE_FILE(
+configure_file(
   ${PROJECT_SOURCE_DIR}/cmake/version.cmake.in
   ${PROJECT_BINARY_DIR}/cmake/version.cmake
   @ONLY
 )
 
-SET(ARCHIVE_BASE_NAME ${CMAKE_PROJECT_NAME})
-STRING(TOLOWER ${ARCHIVE_BASE_NAME} ARCHIVE_BASE_NAME)
-SET(ARCHIVE_NAME ${ARCHIVE_BASE_NAME}-${PROJECT_VERSION})
-ADD_CUSTOM_TARGET(dist
+set(ARCHIVE_BASE_NAME ${CMAKE_PROJECT_NAME})
+string(TOLOWER ${ARCHIVE_BASE_NAME} ARCHIVE_BASE_NAME)
+set(ARCHIVE_NAME ${ARCHIVE_BASE_NAME}-${PROJECT_VERSION})
+add_custom_target(dist
   COMMAND cmake -E remove_directory ${ARCHIVE_NAME}
   COMMAND hg archive ${ARCHIVE_NAME}
   COMMAND cmake -E copy cmake/version.cmake ${ARCHIVE_NAME}/cmake/version.cmake
@@ -350 +350 @@
   WORKING_DIRECTORY ${PROJECT_BINARY_DIR})
 
 # CPACK config (Basically for NSIS)
-IF(${CMAKE_SOURCE_DIR} STREQUAL ${PROJECT_SOURCE_DIR})
-  SET(CPACK_PACKAGE_NAME ${PROJECT_NAME})
-  SET(CPACK_PACKAGE_VENDOR "EGRES")
-  SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY
+if(${CMAKE_SOURCE_DIR} STREQUAL ${PROJECT_SOURCE_DIR})
+  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_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
 
-  SET(CPACK_PACKAGE_VERSION ${PROJECT_VERSION})
+  set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION})
 
-  SET(CPACK_PACKAGE_INSTALL_DIRECTORY
+  set(CPACK_PACKAGE_INSTALL_DIRECTORY
     "${PROJECT_NAME} ${PROJECT_VERSION}")
-  SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY
+  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
+  set(CPACK_COMPONENT_HEADERS_DESCRIPTION
     "C++ header files")
-  SET(CPACK_COMPONENT_LIBRARY_DESCRIPTION
+  set(CPACK_COMPONENT_LIBRARY_DESCRIPTION
     "DLL and import library")
-  SET(CPACK_COMPONENT_BIN_DESCRIPTION
+  set(CPACK_COMPONENT_BIN_DESCRIPTION
     "Command line utilities")
-  SET(CPACK_COMPONENT_HTML_DOCUMENTATION_DESCRIPTION
+  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
+  set(CPACK_COMPONENT_GROUP_DEVELOPMENT_DESCRIPTION
     "Components needed to develop software using LEMON")
-  SET(CPACK_COMPONENT_GROUP_DOCUMENTATION_DESCRIPTION
+  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 "
+  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 "
+  set(CPACK_NSIS_DELETE_ICONS_EXTRA "
     !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP
     Delete \\\"$SMPROGRAMS\\\\$MUI_TEMP\\\\Documentation.lnk\\\"
     ")
 
-  INCLUDE(CPack)
-ENDIF()
+  include(CPack)
+endif()

cmake/FindCOIN.cmake

@@ -1 @@
-SET(COIN_ROOT_DIR "" CACHE PATH "COIN root directory")
+set(COIN_ROOT_DIR "" CACHE PATH "COIN root directory")
 
-FIND_PATH(COIN_INCLUDE_DIR coin/CoinUtilsConfig.h
+find_path(COIN_INCLUDE_DIR coin/CoinUtilsConfig.h
   HINTS ${COIN_ROOT_DIR}/include
 )
-FIND_LIBRARY(COIN_CBC_LIBRARY
+find_library(COIN_CBC_LIBRARY
   NAMES Cbc libCbc
   HINTS ${COIN_ROOT_DIR}/lib/coin
   HINTS ${COIN_ROOT_DIR}/lib
 )
-FIND_LIBRARY(COIN_CBC_SOLVER_LIBRARY
+find_library(COIN_CBC_SOLVER_LIBRARY
   NAMES CbcSolver libCbcSolver
   HINTS ${COIN_ROOT_DIR}/lib/coin
   HINTS ${COIN_ROOT_DIR}/lib
 )
-FIND_LIBRARY(COIN_CGL_LIBRARY
+find_library(COIN_CGL_LIBRARY
   NAMES Cgl libCgl
   HINTS ${COIN_ROOT_DIR}/lib/coin
   HINTS ${COIN_ROOT_DIR}/lib
 )
-FIND_LIBRARY(COIN_CLP_LIBRARY
+find_library(COIN_CLP_LIBRARY
   NAMES Clp libClp
   HINTS ${COIN_ROOT_DIR}/lib/coin
   HINTS ${COIN_ROOT_DIR}/lib
 )
-FIND_LIBRARY(COIN_COIN_UTILS_LIBRARY
+find_library(COIN_COIN_UTILS_LIBRARY
   NAMES CoinUtils libCoinUtils
   HINTS ${COIN_ROOT_DIR}/lib/coin
   HINTS ${COIN_ROOT_DIR}/lib
 )
-FIND_LIBRARY(COIN_OSI_LIBRARY
+find_library(COIN_OSI_LIBRARY
   NAMES Osi libOsi
   HINTS ${COIN_ROOT_DIR}/lib/coin
   HINTS ${COIN_ROOT_DIR}/lib
 )
-FIND_LIBRARY(COIN_OSI_CBC_LIBRARY
+find_library(COIN_OSI_CBC_LIBRARY
   NAMES OsiCbc libOsiCbc
   HINTS ${COIN_ROOT_DIR}/lib/coin
   HINTS ${COIN_ROOT_DIR}/lib
 )
-FIND_LIBRARY(COIN_OSI_CLP_LIBRARY
+find_library(COIN_OSI_CLP_LIBRARY
   NAMES OsiClp libOsiClp
   HINTS ${COIN_ROOT_DIR}/lib/coin
   HINTS ${COIN_ROOT_DIR}/lib
 )
-FIND_LIBRARY(COIN_OSI_VOL_LIBRARY
+find_library(COIN_OSI_VOL_LIBRARY
   NAMES OsiVol libOsiVol
   HINTS ${COIN_ROOT_DIR}/lib/coin
   HINTS ${COIN_ROOT_DIR}/lib
 )
-FIND_LIBRARY(COIN_VOL_LIBRARY
+find_library(COIN_VOL_LIBRARY
   NAMES Vol libVol
   HINTS ${COIN_ROOT_DIR}/lib/coin
   HINTS ${COIN_ROOT_DIR}/lib
 )
 
-FIND_LIBRARY(COIN_ZLIB_LIBRARY
+find_library(COIN_ZLIB_LIBRARY
   NAMES z libz
   HINTS ${COIN_ROOT_DIR}/lib/coin
   HINTS ${COIN_ROOT_DIR}/lib
 )
-FIND_LIBRARY(COIN_BZ2_LIBRARY
+find_library(COIN_BZ2_LIBRARY
   NAMES bz2 libbz2
   HINTS ${COIN_ROOT_DIR}/lib/coin
   HINTS ${COIN_ROOT_DIR}/lib
 )
 
-FIND_LIBRARY(COIN_PTHREADS_LIBRARY
+find_library(COIN_PTHREADS_LIBRARY
   NAMES pthreads libpthreads
   HINTS ${COIN_ROOT_DIR}/lib/coin
   HINTS ${COIN_ROOT_DIR}/lib
 )
 
-INCLUDE(FindPackageHandleStandardArgs)
+include(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(COIN DEFAULT_MSG
   COIN_INCLUDE_DIR
   COIN_CBC_LIBRARY
@@ -86 +86 @@
   # COIN_VOL_LIBRARY
 )
 
-IF(COIN_FOUND)
-  SET(COIN_INCLUDE_DIRS ${COIN_INCLUDE_DIR})
-  SET(COIN_CLP_LIBRARIES "${COIN_CLP_LIBRARY};${COIN_COIN_UTILS_LIBRARY}")
-  IF(COIN_ZLIB_LIBRARY)
-    SET(COIN_CLP_LIBRARIES "${COIN_CLP_LIBRARIES};${COIN_ZLIB_LIBRARY}")
-  ENDIF(COIN_ZLIB_LIBRARY)
-   IF(COIN_BZ2_LIBRARY)
-    SET(COIN_CLP_LIBRARIES "${COIN_CLP_LIBRARIES};${COIN_BZ2_LIBRARY}")
-  ENDIF(COIN_BZ2_LIBRARY)
-   IF(COIN_PTHREADS_LIBRARY)
-    SET(COIN_CLP_LIBRARIES "${COIN_CLP_LIBRARIES};${COIN_PTHREADS_LIBRARY}")
-  ENDIF(COIN_PTHREADS_LIBRARY)
-  SET(COIN_CBC_LIBRARIES "${COIN_CBC_LIBRARY};${COIN_CBC_SOLVER_LIBRARY};${COIN_CGL_LIBRARY};${COIN_OSI_LIBRARY};${COIN_OSI_CBC_LIBRARY};${COIN_OSI_CLP_LIBRARY};${COIN_CLP_LIBRARIES}")
-  SET(COIN_LIBRARIES ${COIN_CBC_LIBRARIES})
-ENDIF(COIN_FOUND)
+if(COIN_FOUND)
+  set(COIN_INCLUDE_DIRS ${COIN_INCLUDE_DIR})
+  set(COIN_CLP_LIBRARIES "${COIN_CLP_LIBRARY};${COIN_COIN_UTILS_LIBRARY}")
+  if(COIN_ZLIB_LIBRARY)
+    set(COIN_CLP_LIBRARIES "${COIN_CLP_LIBRARIES};${COIN_ZLIB_LIBRARY}")
+  endif(COIN_ZLIB_LIBRARY)
+   if(COIN_BZ2_LIBRARY)
+    set(COIN_CLP_LIBRARIES "${COIN_CLP_LIBRARIES};${COIN_BZ2_LIBRARY}")
+  endif(COIN_BZ2_LIBRARY)
+   if(COIN_PTHREADS_LIBRARY)
+    set(COIN_CLP_LIBRARIES "${COIN_CLP_LIBRARIES};${COIN_PTHREADS_LIBRARY}")
+  endif(COIN_PTHREADS_LIBRARY)
+  set(COIN_CBC_LIBRARIES "${COIN_CBC_LIBRARY};${COIN_CBC_SOLVER_LIBRARY};${COIN_CGL_LIBRARY};${COIN_OSI_LIBRARY};${COIN_OSI_CBC_LIBRARY};${COIN_OSI_CLP_LIBRARY};${COIN_CLP_LIBRARIES}")
+  set(COIN_LIBRARIES ${COIN_CBC_LIBRARIES})
+endif(COIN_FOUND)
 
-MARK_AS_ADVANCED(
+mark_as_advanced(
   COIN_INCLUDE_DIR
   COIN_CBC_LIBRARY
   COIN_CBC_SOLVER_LIBRARY

cmake/FindGLPK.cmake

@@ -1 @@
-SET(GLPK_ROOT_DIR "" CACHE PATH "GLPK root directory")
+set(GLPK_ROOT_DIR "" CACHE PATH "GLPK root directory")
 
-SET(GLPK_REGKEY "[HKEY_LOCAL_MACHINE\\SOFTWARE\\GnuWin32\\Glpk;InstallPath]")
-GET_FILENAME_COMPONENT(GLPK_ROOT_PATH ${GLPK_REGKEY} ABSOLUTE)
+set(GLPK_REGKEY "[HKEY_LOCAL_MACHINE\\SOFTWARE\\GnuWin32\\Glpk;InstallPath]")
+get_filename_component(GLPK_ROOT_PATH ${GLPK_REGKEY} ABSOLUTE)
 
-FIND_PATH(GLPK_INCLUDE_DIR
+find_path(GLPK_INCLUDE_DIR
   glpk.h
   PATHS ${GLPK_REGKEY}/include
   HINTS ${GLPK_ROOT_DIR}/include
 )
-FIND_LIBRARY(GLPK_LIBRARY
+find_library(GLPK_LIBRARY
   glpk
   PATHS ${GLPK_REGKEY}/lib
   HINTS ${GLPK_ROOT_DIR}/lib
 )
 
-IF(GLPK_INCLUDE_DIR AND GLPK_LIBRARY)
-  FILE(READ ${GLPK_INCLUDE_DIR}/glpk.h GLPK_GLPK_H)
+if(GLPK_INCLUDE_DIR AND GLPK_LIBRARY)
+  file(READ ${GLPK_INCLUDE_DIR}/glpk.h GLPK_GLPK_H)
 
-  STRING(REGEX MATCH "define[ ]+GLP_MAJOR_VERSION[ ]+[0-9]+" GLPK_MAJOR_VERSION_LINE "${GLPK_GLPK_H}")
-  STRING(REGEX REPLACE "define[ ]+GLP_MAJOR_VERSION[ ]+([0-9]+)" "\\1" GLPK_VERSION_MAJOR "${GLPK_MAJOR_VERSION_LINE}")
+  string(REGEX MATCH "define[ ]+GLP_MAJOR_VERSION[ ]+[0-9]+" GLPK_MAJOR_VERSION_LINE "${GLPK_GLPK_H}")
+  string(REGEX REPLACE "define[ ]+GLP_MAJOR_VERSION[ ]+([0-9]+)" "\\1" GLPK_VERSION_MAJOR "${GLPK_MAJOR_VERSION_LINE}")
 
-  STRING(REGEX MATCH "define[ ]+GLP_MINOR_VERSION[ ]+[0-9]+" GLPK_MINOR_VERSION_LINE "${GLPK_GLPK_H}")
-  STRING(REGEX REPLACE "define[ ]+GLP_MINOR_VERSION[ ]+([0-9]+)" "\\1" GLPK_VERSION_MINOR "${GLPK_MINOR_VERSION_LINE}")
+  string(REGEX MATCH "define[ ]+GLP_MINOR_VERSION[ ]+[0-9]+" GLPK_MINOR_VERSION_LINE "${GLPK_GLPK_H}")
+  string(REGEX REPLACE "define[ ]+GLP_MINOR_VERSION[ ]+([0-9]+)" "\\1" GLPK_VERSION_MINOR "${GLPK_MINOR_VERSION_LINE}")
 
-  SET(GLPK_VERSION_STRING "${GLPK_VERSION_MAJOR}.${GLPK_VERSION_MINOR}")
+  set(GLPK_VERSION_STRING "${GLPK_VERSION_MAJOR}.${GLPK_VERSION_MINOR}")
 
-  IF(GLPK_FIND_VERSION)
-    IF(GLPK_FIND_VERSION_COUNT GREATER 2)
-      MESSAGE(SEND_ERROR "unexpected version string")
-    ENDIF(GLPK_FIND_VERSION_COUNT GREATER 2)
+  if(GLPK_FIND_VERSION)
+    if(GLPK_FIND_VERSION_COUNT GREATER 2)
+      message(SEND_ERROR "unexpected version string")
+    endif(GLPK_FIND_VERSION_COUNT GREATER 2)
 
-    MATH(EXPR GLPK_REQUESTED_VERSION "${GLPK_FIND_VERSION_MAJOR}*100 + ${GLPK_FIND_VERSION_MINOR}")
-    MATH(EXPR GLPK_FOUND_VERSION "${GLPK_VERSION_MAJOR}*100 + ${GLPK_VERSION_MINOR}")
+    math(EXPR GLPK_REQUESTED_VERSION "${GLPK_FIND_VERSION_MAJOR}*100 + ${GLPK_FIND_VERSION_MINOR}")
+    math(EXPR GLPK_FOUND_VERSION "${GLPK_VERSION_MAJOR}*100 + ${GLPK_VERSION_MINOR}")
 
-    IF(GLPK_FOUND_VERSION LESS GLPK_REQUESTED_VERSION)
-      SET(GLPK_PROPER_VERSION_FOUND FALSE)
-    ELSE(GLPK_FOUND_VERSION LESS GLPK_REQUESTED_VERSION)
-      SET(GLPK_PROPER_VERSION_FOUND TRUE)
-    ENDIF(GLPK_FOUND_VERSION LESS GLPK_REQUESTED_VERSION)
-  ELSE(GLPK_FIND_VERSION)
-    SET(GLPK_PROPER_VERSION_FOUND TRUE)
-  ENDIF(GLPK_FIND_VERSION)
-ENDIF(GLPK_INCLUDE_DIR AND GLPK_LIBRARY)
+    if(GLPK_FOUND_VERSION LESS GLPK_REQUESTED_VERSION)
+      set(GLPK_PROPER_VERSION_FOUND FALSE)
+    else(GLPK_FOUND_VERSION LESS GLPK_REQUESTED_VERSION)
+      set(GLPK_PROPER_VERSION_FOUND TRUE)
+    endif(GLPK_FOUND_VERSION LESS GLPK_REQUESTED_VERSION)
+  else(GLPK_FIND_VERSION)
+    set(GLPK_PROPER_VERSION_FOUND TRUE)
+  endif(GLPK_FIND_VERSION)
+endif(GLPK_INCLUDE_DIR AND GLPK_LIBRARY)
 
-INCLUDE(FindPackageHandleStandardArgs)
+include(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(GLPK DEFAULT_MSG GLPK_LIBRARY GLPK_INCLUDE_DIR GLPK_PROPER_VERSION_FOUND)
 
-IF(GLPK_FOUND)
-  SET(GLPK_INCLUDE_DIRS ${GLPK_INCLUDE_DIR})
-  SET(GLPK_LIBRARIES ${GLPK_LIBRARY})
-  SET(GLPK_BIN_DIR ${GLPK_ROOT_PATH}/bin)
-ENDIF(GLPK_FOUND)
+if(GLPK_FOUND)
+  set(GLPK_INCLUDE_DIRS ${GLPK_INCLUDE_DIR})
+  set(GLPK_LIBRARIES ${GLPK_LIBRARY})
+  set(GLPK_BIN_DIR ${GLPK_ROOT_PATH}/bin)
+endif(GLPK_FOUND)
 
-MARK_AS_ADVANCED(GLPK_LIBRARY GLPK_INCLUDE_DIR GLPK_BIN_DIR)
+mark_as_advanced(GLPK_LIBRARY GLPK_INCLUDE_DIR GLPK_BIN_DIR)

cmake/FindGhostscript.cmake

@@ -1 @@
-INCLUDE(FindPackageHandleStandardArgs)
+include(FindPackageHandleStandardArgs)
 
-FIND_PROGRAM(GHOSTSCRIPT_EXECUTABLE
+find_program(GHOSTSCRIPT_EXECUTABLE
   NAMES gs gswin32c
   PATHS "$ENV{ProgramFiles}/gs"
   PATH_SUFFIXES gs8.61/bin gs8.62/bin gs8.63/bin gs8.64/bin gs8.65/bin

cmake/FindILOG.cmake

@@ -1 @@
-FIND_PATH(ILOG_ROOT_DIR
+find_path(ILOG_ROOT_DIR
   NAMES cplex
   DOC "CPLEX STUDIO root directory"
   PATHS /opt/ibm/ILOG /usr/local/ibm/ILOG /usr/local/ILOG /usr/local/ilog
@@ -10 +10 @@
   NO_DEFAULT_PATH
 )
 
-IF(WIN32)
-  IF(MSVC_VERSION STREQUAL "1400")
-    SET(ILOG_WIN_COMPILER "windows_vs2005")
-  ELSEIF(MSVC_VERSION STREQUAL "1500")
-    SET(ILOG_WIN_COMPILER "windows_vs2008")
-  ELSEIF(MSVC_VERSION STREQUAL "1600")
-    SET(ILOG_WIN_COMPILER "windows_vs2010")
-  ELSE()
-    SET(ILOG_WIN_COMPILER "windows_vs2008")
-  ENDIF()
-  IF(CMAKE_CL_64)
-    SET(ILOG_WIN_COMPILER "x64_${ILOG_WIN_COMPILER}")
-    SET(ILOG_WIN_PLATFORM "x64_win32")
-  ELSE()
-    SET(ILOG_WIN_COMPILER "x86_${ILOG_WIN_COMPILER}")
-    SET(ILOG_WIN_PLATFORM "x86_win32")
-  ENDIF()
-ENDIF()
+if(WIN32)
+  if(MSVC_VERSION STREQUAL "1400")
+    set(ILOG_WIN_COMPILER "windows_vs2005")
+  elseif(MSVC_VERSION STREQUAL "1500")
+    set(ILOG_WIN_COMPILER "windows_vs2008")
+  elseif(MSVC_VERSION STREQUAL "1600")
+    set(ILOG_WIN_COMPILER "windows_vs2010")
+  else()
+    set(ILOG_WIN_COMPILER "windows_vs2008")
+  endif()
+  if(CMAKE_CL_64)
+    set(ILOG_WIN_COMPILER "x64_${ILOG_WIN_COMPILER}")
+    set(ILOG_WIN_PLATFORM "x64_win32")
+  else()
+    set(ILOG_WIN_COMPILER "x86_${ILOG_WIN_COMPILER}")
+    set(ILOG_WIN_PLATFORM "x86_win32")
+  endif()
+endif()
 
-FIND_PATH(ILOG_CPLEX_ROOT_DIR
+find_path(ILOG_CPLEX_ROOT_DIR
   NAMES include/ilcplex
   HINTS ${ILOG_ROOT_DIR}/cplex ${ILOG_ROOT_DIR}/cplex121
   ${ILOG_ROOT_DIR}/cplex122 ${ILOG_ROOT_DIR}/cplex123
@@ -37 +37 @@
   NO_DEFAULT_PATH
 )
 
-FIND_PATH(ILOG_CONCERT_ROOT_DIR
+find_path(ILOG_CONCERT_ROOT_DIR
   NAMES include/ilconcert
   HINTS ${ILOG_ROOT_DIR}/concert ${ILOG_ROOT_DIR}/concert29
   DOC "CONCERT root directory"
   NO_DEFAULT_PATH
 )
 
-FIND_PATH(ILOG_CPLEX_INCLUDE_DIR
+find_path(ILOG_CPLEX_INCLUDE_DIR
   ilcplex/cplex.h
   HINTS ${ILOG_CPLEX_ROOT_DIR}/include
   NO_DEFAULT_PATH
 )
 
-FIND_PATH(ILOG_CONCERT_INCLUDE_DIR
+find_path(ILOG_CONCERT_INCLUDE_DIR
   ilconcert/ilobasic.h
   HINTS ${ILOG_CONCERT_ROOT_DIR}/include
   NO_DEFAULT_PATH
 )
 
-FIND_LIBRARY(ILOG_CPLEX_LIBRARY
+find_library(ILOG_CPLEX_LIBRARY
   cplex cplex121 cplex122 cplex123 cplex124
   HINTS ${ILOG_CPLEX_ROOT_DIR}/lib/x86_sles10_4.1/static_pic
   ${ILOG_CPLEX_ROOT_DIR}/lib/x86-64_sles10_4.1/static_pic
@@ -68 +68 @@
   NO_DEFAULT_PATH
   )
 
-FIND_LIBRARY(ILOG_CONCERT_LIBRARY
+find_library(ILOG_CONCERT_LIBRARY
   concert
   HINTS ${ILOG_CONCERT_ROOT_DIR}/lib/x86_sles10_4.1/static_pic
   ${ILOG_CONCERT_ROOT_DIR}/lib/x86-64_sles10_4.1/static_pic
@@ -80 +80 @@
   NO_DEFAULT_PATH
   )
 
-FIND_FILE(ILOG_CPLEX_DLL
+find_file(ILOG_CPLEX_DLL
   cplex121.dll cplex122.dll cplex123.dll cplex124.dll
   HINTS ${ILOG_CPLEX_ROOT_DIR}/bin/${ILOG_WIN_PLATFORM}
   NO_DEFAULT_PATH
   )
 
-INCLUDE(FindPackageHandleStandardArgs)
+include(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(ILOG
   DEFAULT_MSG ILOG_CPLEX_LIBRARY ILOG_CPLEX_INCLUDE_DIR
   )
 
-IF(ILOG_FOUND)
-  SET(ILOG_INCLUDE_DIRS ${ILOG_CPLEX_INCLUDE_DIR} ${ILOG_CONCERT_INCLUDE_DIR})
-  SET(ILOG_LIBRARIES ${ILOG_CPLEX_LIBRARY} ${ILOG_CONCERT_LIBRARY})
-  IF(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-    # SET(CPLEX_LIBRARIES "${CPLEX_LIBRARIES};m;pthread")
-    SET(ILOG_LIBRARIES ${ILOG_LIBRARIES} "m" "pthread" "dl")
-  ENDIF(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-ENDIF(ILOG_FOUND)
+if(ILOG_FOUND)
+  set(ILOG_INCLUDE_DIRS ${ILOG_CPLEX_INCLUDE_DIR} ${ILOG_CONCERT_INCLUDE_DIR})
+  set(ILOG_LIBRARIES ${ILOG_CPLEX_LIBRARY} ${ILOG_CONCERT_LIBRARY})
+  if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    # set(CPLEX_LIBRARIES "${CPLEX_LIBRARIES};m;pthread")
+    set(ILOG_LIBRARIES ${ILOG_LIBRARIES} "m" "pthread" "dl")
+  endif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+endif(ILOG_FOUND)
 
-MARK_AS_ADVANCED(
+mark_as_advanced(
   ILOG_CPLEX_LIBRARY ILOG_CPLEX_INCLUDE_DIR ILOG_CPLEX_DLL
   ILOG_CONCERT_LIBRARY ILOG_CONCERT_INCLUDE_DIR ILOG_CONCERT_DLL
   )

cmake/FindSOPLEX.cmake

@@ -1 @@
-SET(SOPLEX_ROOT_DIR "" CACHE PATH "SoPlex root directory")
+set(SOPLEX_ROOT_DIR "" CACHE PATH "SoPlex root directory")
 
-FIND_PATH(SOPLEX_INCLUDE_DIR
+find_path(SOPLEX_INCLUDE_DIR
   soplex.h
   HINTS ${SOPLEX_ROOT_DIR}/src
 )
-FIND_LIBRARY(SOPLEX_LIBRARY
+find_library(SOPLEX_LIBRARY
   soplex
   HINTS ${SOPLEX_ROOT_DIR}/lib
 )
 
-INCLUDE(FindPackageHandleStandardArgs)
+include(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(SOPLEX DEFAULT_MSG SOPLEX_LIBRARY SOPLEX_INCLUDE_DIR)
 
-IF(SOPLEX_FOUND)
-  SET(SOPLEX_INCLUDE_DIRS ${SOPLEX_INCLUDE_DIR})
-  SET(SOPLEX_LIBRARIES ${SOPLEX_LIBRARY})
-  IF(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-    SET(SOPLEX_LIBRARIES "${SOPLEX_LIBRARIES};z")
-  ENDIF(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-ENDIF(SOPLEX_FOUND)
+if(SOPLEX_FOUND)
+  set(SOPLEX_INCLUDE_DIRS ${SOPLEX_INCLUDE_DIR})
+  set(SOPLEX_LIBRARIES ${SOPLEX_LIBRARY})
+  if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    set(SOPLEX_LIBRARIES "${SOPLEX_LIBRARIES};z")
+  endif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+endif(SOPLEX_FOUND)
 
-MARK_AS_ADVANCED(SOPLEX_LIBRARY SOPLEX_INCLUDE_DIR)
+mark_as_advanced(SOPLEX_LIBRARY SOPLEX_INCLUDE_DIR)

cmake/LEMONConfig.cmake.in

@@ -1 @@
-SET(LEMON_INCLUDE_DIR "@CMAKE_INSTALL_PREFIX@/include" CACHE PATH "LEMON include directory")
-SET(LEMON_INCLUDE_DIRS "${LEMON_INCLUDE_DIR}")
+set(LEMON_INCLUDE_DIR "@CMAKE_INSTALL_PREFIX@/include" CACHE PATH "LEMON include directory")
+set(LEMON_INCLUDE_DIRS "${LEMON_INCLUDE_DIR}")
 
-IF(UNIX)
-  SET(LEMON_LIB_NAME "libemon.a")
-ELSEIF(WIN32)
-  SET(LEMON_LIB_NAME "lemon.lib")
-ENDIF(UNIX)
+if(UNIX)
+  set(LEMON_LIB_NAME "libemon.a")
+elseif(WIN32)
+  set(LEMON_LIB_NAME "lemon.lib")
+endif(UNIX)
 
-SET(LEMON_LIBRARY "@CMAKE_INSTALL_PREFIX@/lib/${LEMON_LIB_NAME}" CACHE FILEPATH "LEMON library")
-SET(LEMON_LIBRARIES "${LEMON_LIBRARY}")
+set(LEMON_LIBRARY "@CMAKE_INSTALL_PREFIX@/lib/${LEMON_LIB_NAME}" CACHE FILEPATH "LEMON library")
+set(LEMON_LIBRARIES "${LEMON_LIBRARY}")
 
-MARK_AS_ADVANCED(LEMON_LIBRARY LEMON_INCLUDE_DIR)
+mark_as_advanced(LEMON_LIBRARY LEMON_INCLUDE_DIR)

cmake/version.cmake.in

@@ -1 @@
-SET(LEMON_VERSION "@LEMON_VERSION@" CACHE STRING "LEMON version string.")
+set(LEMON_VERSION "@LEMON_VERSION@" CACHE STRING "LEMON version string.")

contrib/CMakeLists.txt

@@ -1 @@
-INCLUDE_DIRECTORIES(
+include_directories(
   ${PROJECT_SOURCE_DIR}
   ${PROJECT_BINARY_DIR}
 )
 
-LINK_DIRECTORIES(
+link_directories(
   ${PROJECT_BINARY_DIR}/lemon
 )
 
@@ -14 +14 @@
 # whitespaces. Moreover, you can add multiple similar blocks if you
 # want to build more than one executables.
 
-# ADD_EXECUTABLE(myprog myprog-main.cc)
-# TARGET_LINK_LIBRARIES(myprog lemon)
+# add_executable(myprog myprog-main.cc)
+# target_link_libraries(myprog lemon)
 

demo/CMakeLists.txt

@@ -1 @@
-INCLUDE_DIRECTORIES(
+include_directories(
   ${PROJECT_SOURCE_DIR}
   ${PROJECT_BINARY_DIR}
 )
 
-LINK_DIRECTORIES(
+link_directories(
   ${PROJECT_BINARY_DIR}/lemon
 )
 
-SET(DEMOS
+set(DEMOS
   arg_parser_demo
   graph_to_eps_demo
   lgf_demo
 )
 
-FOREACH(DEMO_NAME ${DEMOS})
-  ADD_EXECUTABLE(${DEMO_NAME} ${DEMO_NAME}.cc)
-  TARGET_LINK_LIBRARIES(${DEMO_NAME} lemon)
-ENDFOREACH()
+foreach(DEMO_NAME ${DEMOS})
+  add_executable(${DEMO_NAME} ${DEMO_NAME}.cc)
+  target_link_libraries(${DEMO_NAME} lemon)
+endforeach()

doc/CMakeLists.txt

@@ -1 @@
-SET(PACKAGE_NAME ${PROJECT_NAME})
-SET(PACKAGE_VERSION ${PROJECT_VERSION})
-SET(abs_top_srcdir ${PROJECT_SOURCE_DIR})
-SET(abs_top_builddir ${PROJECT_BINARY_DIR})
+set(PACKAGE_NAME ${PROJECT_NAME})
+set(PACKAGE_VERSION ${PROJECT_VERSION})
+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).")
-SET(LEMON_DOC_USE_MATHJAX "NO" CACHE STRING "Use MathJax to display math formulae (YES/NO).")
-SET(LEMON_DOC_MATHJAX_RELPATH "http://www.mathjax.org/mathjax" CACHE STRING "MathJax library location.")
+set(LEMON_DOC_SOURCE_BROWSER "NO" CACHE STRING "Include source into the doc (YES/NO).")
+set(LEMON_DOC_USE_MATHJAX "NO" CACHE STRING "Use MathJax to display math formulae (YES/NO).")
+set(LEMON_DOC_MATHJAX_RELPATH "http://www.mathjax.org/mathjax" CACHE STRING "MathJax library location.")
 
-SET(LEMON_DOC_LIBSTDC++_URL
+set(LEMON_DOC_LIBSTDC++_URL
   "http://gcc.gnu.org/onlinedocs/gcc-4.7.3/libstdc++/api"
   CACHE STRING "GCC libstdc++ doxygen doc url.")
 
 
-CONFIGURE_FILE(
+configure_file(
   ${PROJECT_SOURCE_DIR}/doc/Doxyfile.in
   ${PROJECT_BINARY_DIR}/doc/Doxyfile
   @ONLY
 )
 
-CONFIGURE_FILE(
+configure_file(
   ${PROJECT_SOURCE_DIR}/doc/mainpage.dox.in
   ${PROJECT_BINARY_DIR}/doc/mainpage.dox
   @ONLY
 )
 
 # Copy doc from source (if exists)
-IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/html AND 
+if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/html AND 
     NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/html/index.html)
-  MESSAGE(STATUS "Copy doc from source tree")
-  EXECUTE_PROCESS(
+  message(STATUS "Copy doc from source tree")
+  execute_process(
     COMMAND cmake -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/html ${CMAKE_CURRENT_BINARY_DIR}/html
     )
-ENDIF()
+endif()
 
-IF(DOXYGEN_EXECUTABLE AND PYTHONINTERP_FOUND AND GHOSTSCRIPT_EXECUTABLE)
-  FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/)
-  SET(GHOSTSCRIPT_OPTIONS -dNOPAUSE -dBATCH -q -dEPSCrop -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -sDEVICE=pngalpha)
-  ADD_CUSTOM_TARGET(html
+if(DOXYGEN_EXECUTABLE AND PYTHONINTERP_FOUND AND GHOSTSCRIPT_EXECUTABLE)
+  file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/)
+  set(GHOSTSCRIPT_OPTIONS -dNOPAUSE -dBATCH -q -dEPSCrop -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -sDEVICE=pngalpha)
+  add_custom_target(html
     COMMAND ${CMAKE_COMMAND} -E remove_directory gen-images
     COMMAND ${CMAKE_COMMAND} -E make_directory gen-images
     COMMAND ${GHOSTSCRIPT_EXECUTABLE} ${GHOSTSCRIPT_OPTIONS} -r20 -sOutputFile=gen-images/grid_graph.png ${CMAKE_CURRENT_SOURCE_DIR}/images/grid_graph.eps
@@ -60 +60 @@
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
   )
 
-  SET_TARGET_PROPERTIES(html PROPERTIES PROJECT_LABEL BUILD_DOC)
+  set_target_properties(html PROPERTIES PROJECT_LABEL BUILD_DOC)
 
-  IF(UNIX)
-    INSTALL(
+  if(UNIX)
+    install(
       DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/
       DESTINATION share/doc/lemon/html
       COMPONENT html_documentation
     )
-  ELSEIF(WIN32)
-    INSTALL(
+  elseif(WIN32)
+    install(
       DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/
       DESTINATION doc
       COMPONENT html_documentation
     )
-  ENDIF()
+  endif()
 
-ENDIF()
+endif()
 
-IF(WGET_FOUND)
-ADD_CUSTOM_TARGET(update-external-tags
+if(WGET_FOUND)
+add_custom_target(update-external-tags
   COMMAND ${WGET_EXECUTABLE} -N ${LEMON_DOC_LIBSTDC++_URL}/libstdc++.tag
   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
   )
-ENDIF()
+endif()

lemon/CMakeLists.txt

@@ -1 @@
-INCLUDE_DIRECTORIES(
+include_directories(
   ${PROJECT_SOURCE_DIR}
   ${PROJECT_BINARY_DIR}
 )
 
-CONFIGURE_FILE(
+configure_file(
   ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in
   ${CMAKE_CURRENT_BINARY_DIR}/config.h
 )
 
-CONFIGURE_FILE(
+configure_file(
   ${CMAKE_CURRENT_SOURCE_DIR}/lemon.pc.in
   ${CMAKE_CURRENT_BINARY_DIR}/lemon.pc
   @ONLY
 )
 
-SET(LEMON_SOURCES
+set(LEMON_SOURCES
   arg_parser.cc
   base.cc
   color.cc
@@ -24 +24 @@
   bits/windows.cc
 )
 
-IF(LEMON_HAVE_GLPK)
-  SET(LEMON_SOURCES ${LEMON_SOURCES} glpk.cc)
-  INCLUDE_DIRECTORIES(${GLPK_INCLUDE_DIRS})
-  IF(WIN32)
-    INSTALL(FILES ${GLPK_BIN_DIR}/glpk.dll DESTINATION bin)
-    INSTALL(FILES ${GLPK_BIN_DIR}/libltdl3.dll DESTINATION bin)
-    INSTALL(FILES ${GLPK_BIN_DIR}/zlib1.dll DESTINATION bin)
-  ENDIF()
-ENDIF()
+if(LEMON_HAVE_GLPK)
+  set(LEMON_SOURCES ${LEMON_SOURCES} glpk.cc)
+  include_directories(${GLPK_INCLUDE_DIRS})
+  if(WIN32)
+    install(FILES ${GLPK_BIN_DIR}/glpk.dll DESTINATION bin)
+    install(FILES ${GLPK_BIN_DIR}/libltdl3.dll DESTINATION bin)
+    install(FILES ${GLPK_BIN_DIR}/zlib1.dll DESTINATION bin)
+  endif()
+endif()
 
-IF(LEMON_HAVE_CPLEX)
-  SET(LEMON_SOURCES ${LEMON_SOURCES} cplex.cc)
-  INCLUDE_DIRECTORIES(${ILOG_INCLUDE_DIRS})
-ENDIF()
+if(LEMON_HAVE_CPLEX)
+  set(LEMON_SOURCES ${LEMON_SOURCES} cplex.cc)
+  include_directories(${ILOG_INCLUDE_DIRS})
+endif()
 
-IF(LEMON_HAVE_CLP)
-  SET(LEMON_SOURCES ${LEMON_SOURCES} clp.cc)
-  INCLUDE_DIRECTORIES(${COIN_INCLUDE_DIRS})
-ENDIF()
+if(LEMON_HAVE_CLP)
+  set(LEMON_SOURCES ${LEMON_SOURCES} clp.cc)
+  include_directories(${COIN_INCLUDE_DIRS})
+endif()
 
-IF(LEMON_HAVE_CBC)
-  SET(LEMON_SOURCES ${LEMON_SOURCES} cbc.cc)
-  INCLUDE_DIRECTORIES(${COIN_INCLUDE_DIRS})
-ENDIF()
+if(LEMON_HAVE_CBC)
+  set(LEMON_SOURCES ${LEMON_SOURCES} cbc.cc)
+  include_directories(${COIN_INCLUDE_DIRS})
+endif()
 
-IF(LEMON_HAVE_SOPLEX)
-  SET(LEMON_SOURCES ${LEMON_SOURCES} soplex.cc)
-  INCLUDE_DIRECTORIES(${SOPLEX_INCLUDE_DIRS})
-ENDIF()
+if(LEMON_HAVE_SOPLEX)
+  set(LEMON_SOURCES ${LEMON_SOURCES} soplex.cc)
+  include_directories(${SOPLEX_INCLUDE_DIRS})
+endif()
 
-ADD_LIBRARY(lemon ${LEMON_SOURCES})
+add_library(lemon ${LEMON_SOURCES})
 
-TARGET_LINK_LIBRARIES(lemon
+target_link_libraries(lemon
   ${GLPK_LIBRARIES} ${COIN_LIBRARIES} ${ILOG_LIBRARIES} ${SOPLEX_LIBRARIES}
   )
 
-IF(UNIX)
-  SET_TARGET_PROPERTIES(lemon PROPERTIES OUTPUT_NAME emon VERSION ${LEMON_VERSION} SOVERSION ${LEMON_VERSION})
-ENDIF()
+if(UNIX)
+  set_target_properties(lemon PROPERTIES OUTPUT_NAME emon VERSION ${LEMON_VERSION} SOVERSION ${LEMON_VERSION})
+endif()
 
-INSTALL(
+install(
   TARGETS lemon
   ARCHIVE DESTINATION lib
   LIBRARY DESTINATION lib
   COMPONENT library
 )
 
-INSTALL(
+install(
   DIRECTORY . bits concepts
   DESTINATION include/lemon
   COMPONENT headers
   FILES_MATCHING PATTERN "*.h"
 )
 
-INSTALL(
+install(
   FILES ${CMAKE_CURRENT_BINARY_DIR}/config.h
   DESTINATION include/lemon
   COMPONENT headers
 )
 
-INSTALL(
+install(
   FILES ${CMAKE_CURRENT_BINARY_DIR}/lemon.pc
   DESTINATION lib/pkgconfig
 )

test/CMakeLists.txt

@@ -1 @@
-INCLUDE_DIRECTORIES(
+include_directories(
   ${PROJECT_SOURCE_DIR}
   ${PROJECT_BINARY_DIR}
 )
 
-LINK_DIRECTORIES(
+link_directories(
   ${PROJECT_BINARY_DIR}/lemon
 )
 
-SET(TEST_WITH_VALGRIND "NO" CACHE STRING
+set(TEST_WITH_VALGRIND "NO" CACHE STRING
   "Run the test with valgrind (YES/NO).")
-SET(VALGRIND_FLAGS "" CACHE STRING "Valgrind flags used by the tests.")
+set(VALGRIND_FLAGS "" CACHE STRING "Valgrind flags used by the tests.")
 
-SET(TESTS
+set(TESTS
   adaptors_test
   arc_look_up_test
   bellman_ford_test
@@ -57 +57 @@
   vf2_test
 )
 
-IF(LEMON_HAVE_LP)
-  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()
+if(LEMON_HAVE_LP)
+  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)
+  set(LP_TEST_LIBS lemon)
 
-  IF(LEMON_HAVE_GLPK)
-    SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${GLPK_LIBRARIES})
-  ENDIF()
-  IF(LEMON_HAVE_CPLEX)
-    SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${ILOG_LIBRARIES})
-  ENDIF()
-  IF(LEMON_HAVE_CLP)
-    SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${COIN_CLP_LIBRARIES})
-  ENDIF()
-  IF(LEMON_HAVE_SOPLEX)
-    SET(LP_TEST_LIBS ${LP_TEST_LIBS} ${SOPLEX_LIBRARIES})
-  ENDIF()
+  if(LEMON_HAVE_GLPK)
+    set(LP_TEST_LIBS ${LP_TEST_LIBS} ${GLPK_LIBRARIES})
+  endif()
+  if(LEMON_HAVE_CPLEX)
+    set(LP_TEST_LIBS ${LP_TEST_LIBS} ${ILOG_LIBRARIES})
+  endif()
+  if(LEMON_HAVE_CLP)
+    set(LP_TEST_LIBS ${LP_TEST_LIBS} ${COIN_CLP_LIBRARIES})
+  endif()
+  if(LEMON_HAVE_SOPLEX)
+    set(LP_TEST_LIBS ${LP_TEST_LIBS} ${SOPLEX_LIBRARIES})
+  endif()
 
-  TARGET_LINK_LIBRARIES(lp_test ${LP_TEST_LIBS})
-  ADD_TEST(lp_test lp_test)
-  ADD_DEPENDENCIES(check lp_test)
+  target_link_libraries(lp_test ${LP_TEST_LIBS})
+  add_test(lp_test lp_test)
+  add_dependencies(check lp_test)
 
-  IF(WIN32 AND LEMON_HAVE_GLPK)
-    ADD_CUSTOM_COMMAND(TARGET lp_test POST_BUILD
+  if(WIN32 AND LEMON_HAVE_GLPK)
+    add_custom_command(TARGET lp_test POST_BUILD
       COMMAND ${CMAKE_COMMAND} -E copy ${GLPK_BIN_DIR}/glpk.dll $<TARGET_FILE_DIR:lp_test>
       COMMAND ${CMAKE_COMMAND} -E copy ${GLPK_BIN_DIR}/libltdl3.dll $<TARGET_FILE_DIR:lp_test>
       COMMAND ${CMAKE_COMMAND} -E copy ${GLPK_BIN_DIR}/zlib1.dll $<TARGET_FILE_DIR:lp_test>
     )
-  ENDIF()
+  endif()
 
-  IF(WIN32 AND LEMON_HAVE_CPLEX)
-    GET_TARGET_PROPERTY(TARGET_LOC lp_test LOCATION)
-    GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH)
-    ADD_CUSTOM_COMMAND(TARGET lp_test POST_BUILD
+  if(WIN32 AND LEMON_HAVE_CPLEX)
+    get_target_property(TARGET_LOC lp_test LOCATION)
+    get_filename_component(TARGET_PATH ${TARGET_LOC} PATH)
+    add_custom_command(TARGET lp_test POST_BUILD
       COMMAND ${CMAKE_COMMAND} -E copy ${ILOG_CPLEX_DLL} ${TARGET_PATH}
     )
-  ENDIF()
-ENDIF()
+  endif()
+endif()
 
-IF(LEMON_HAVE_MIP)
-  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()
+if(LEMON_HAVE_MIP)
+  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)
+  set(MIP_TEST_LIBS lemon)
 
-  IF(LEMON_HAVE_GLPK)
-    SET(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${GLPK_LIBRARIES})
-  ENDIF()
-  IF(LEMON_HAVE_CPLEX)
-    SET(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${ILOG_LIBRARIES})
-  ENDIF()
-  IF(LEMON_HAVE_CBC)
-    SET(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${COIN_CBC_LIBRARIES})
-  ENDIF()
+  if(LEMON_HAVE_GLPK)
+    set(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${GLPK_LIBRARIES})
+  endif()
+  if(LEMON_HAVE_CPLEX)
+    set(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${ILOG_LIBRARIES})
+  endif()
+  if(LEMON_HAVE_CBC)
+    set(MIP_TEST_LIBS ${MIP_TEST_LIBS} ${COIN_CBC_LIBRARIES})
+  endif()
 
-  TARGET_LINK_LIBRARIES(mip_test ${MIP_TEST_LIBS})
-  ADD_TEST(mip_test mip_test)
-  ADD_DEPENDENCIES(check mip_test)
+  target_link_libraries(mip_test ${MIP_TEST_LIBS})
+  add_test(mip_test mip_test)
+  add_dependencies(check mip_test)
 
-  IF(WIN32 AND LEMON_HAVE_GLPK)
-    GET_TARGET_PROPERTY(TARGET_LOC mip_test LOCATION)
-    GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH)
-    ADD_CUSTOM_COMMAND(TARGET mip_test POST_BUILD
+  if(WIN32 AND LEMON_HAVE_GLPK)
+    get_target_property(TARGET_LOC mip_test LOCATION)
+    get_filename_component(TARGET_PATH ${TARGET_LOC} PATH)
+    add_custom_command(TARGET mip_test POST_BUILD
       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()
+  endif()
 
-  IF(WIN32 AND LEMON_HAVE_CPLEX)
-    GET_TARGET_PROPERTY(TARGET_LOC mip_test LOCATION)
-    GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH)
-    ADD_CUSTOM_COMMAND(TARGET mip_test POST_BUILD
+  if(WIN32 AND LEMON_HAVE_CPLEX)
+    get_target_property(TARGET_LOC mip_test LOCATION)
+    get_filename_component(TARGET_PATH ${TARGET_LOC} PATH)
+    add_custom_command(TARGET mip_test POST_BUILD
       COMMAND ${CMAKE_COMMAND} -E copy ${ILOG_CPLEX_DLL} ${TARGET_PATH}
     )
-  ENDIF()
-ENDIF()
+  endif()
+endif()
 
-FOREACH(TEST_NAME ${TESTS})
-  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)
-    IF(TEST_WITH_VALGRIND)
-      ADD_TEST(${TEST_NAME}
+foreach(TEST_NAME ${TESTS})
+  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)
+    if(TEST_WITH_VALGRIND)
+      add_test(${TEST_NAME}
         valgrind --error-exitcode=1 ${VALGRIND_FLAGS}
         ${CMAKE_CURRENT_BINARY_DIR}/${TEST_NAME} )
-    ELSE()
-      ADD_TEST(${TEST_NAME} ${TEST_NAME})
-    ENDIF()
-  ADD_DEPENDENCIES(check ${TEST_NAME})
-ENDFOREACH()
+    else()
+      add_test(${TEST_NAME} ${TEST_NAME})
+    endif()
+  add_dependencies(check ${TEST_NAME})
+endforeach()

tools/CMakeLists.txt

@@ -1 @@
-INCLUDE_DIRECTORIES(
+include_directories(
   ${PROJECT_SOURCE_DIR}
   ${PROJECT_BINARY_DIR}
 )
 
-LINK_DIRECTORIES(
+link_directories(
   ${PROJECT_BINARY_DIR}/lemon
 )
 
-ADD_EXECUTABLE(lgf-gen lgf-gen.cc)
-TARGET_LINK_LIBRARIES(lgf-gen lemon)
+add_executable(lgf-gen lgf-gen.cc)
+target_link_libraries(lgf-gen lemon)
 
-ADD_EXECUTABLE(dimacs-to-lgf dimacs-to-lgf.cc)
-TARGET_LINK_LIBRARIES(dimacs-to-lgf lemon)
+add_executable(dimacs-to-lgf dimacs-to-lgf.cc)
+target_link_libraries(dimacs-to-lgf lemon)
 
-ADD_EXECUTABLE(dimacs-solver dimacs-solver.cc)
-TARGET_LINK_LIBRARIES(dimacs-solver lemon)
+add_executable(dimacs-solver dimacs-solver.cc)
+target_link_libraries(dimacs-solver lemon)
 
-INSTALL(
+install(
   TARGETS lgf-gen dimacs-to-lgf dimacs-solver
   RUNTIME DESTINATION bin
   COMPONENT bin
 )
 
-IF(NOT WIN32)
-  INSTALL(
+if(NOT WIN32)
+  install(
     PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/lemon-0.x-to-1.x.sh
     DESTINATION bin
     COMPONENT bin
   )
-ENDIF()
+endif()