COIN-OR::LEMON - Graph Library

Changeset 518:8668e1b5dafb in lemon-1.2 for CMakeLists.txt


Ignore:
Timestamp:
02/22/09 10:52:44 (10 years ago)
Author:
Alpar Juttner <alpar@…>
Branch:
default
Parents:
517:2b6d5d22bb23 (diff), 489:97070bd10b98 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Phase:
public
Message:

Merge

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • CMakeLists.txt

    r489 r518  
    1414INCLUDE(FindDoxygen)
    1515INCLUDE(FindGhostscript)
     16FIND_PACKAGE(GLPK 4.33)
     17
     18ADD_DEFINITIONS(-DHAVE_CONFIG_H)
     19
     20IF(MSVC)
     21  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4250 /wd4355 /wd4800 /wd4996")
     22# Suppressed warnings:
     23# C4250: 'class1' : inherits 'class2::member' via dominance
     24# C4355: 'this' : used in base member initializer list
     25# C4800: 'type' : forcing value to bool 'true' or 'false' (performance warning)
     26# C4996: 'function': was declared deprecated
     27ENDIF(MSVC)
     28
     29IF(GLPK_FOUND)
     30  SET(HAVE_LP TRUE)
     31  SET(HAVE_MIP TRUE)
     32  SET(HAVE_GLPK TRUE)
     33ENDIF(GLPK_FOUND)
    1634
    1735INCLUDE(CheckTypeSize)
  • CMakeLists.txt

    r517 r518  
    9797  SET(CPACK_NSIS_CONTACT "lemon-user@lemon.cs.elte.hu")
    9898  SET(CPACK_NSIS_CREATE_ICONS_EXTRA "
    99     CreateShortCut \\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Documentation.lnk\\\" \\\"$INSTDIR\\\\doc\\\\index.html\\\"
     99    CreateShortCut \\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Documentation.lnk\\\" \\\"$INSTDIR\\\\share\\\\doc\\\\index.html\\\"
    100100    ")
    101101  SET(CPACK_NSIS_DELETE_ICONS_EXTRA "
Note: See TracChangeset for help on using the changeset viewer.