COIN-OR::LEMON - Graph Library

Changeset 521:51c1d11cbde9 in lemon


Ignore:
Timestamp:
02/22/09 10:51:59 (9 years ago)
Author:
Alpar Juttner <alpar@…>
Branch:
1.0
Parents:
519:d3524090d5e2 (diff), 520: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.
Message:

Merge

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • CMakeLists.txt

    r519 r521  
    8888  SET(CPACK_NSIS_CONTACT "lemon-user@lemon.cs.elte.hu") 
    8989  SET(CPACK_NSIS_CREATE_ICONS_EXTRA " 
    90     CreateShortCut \\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Documentation.lnk\\\" \\\"$INSTDIR\\\\doc\\\\index.html\\\" 
     90    CreateShortCut \\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Documentation.lnk\\\" \\\"$INSTDIR\\\\share\\\\doc\\\\index.html\\\" 
    9191    ") 
    9292  SET(CPACK_NSIS_DELETE_ICONS_EXTRA " 
  • CMakeLists.txt

    r520 r521  
    1111 
    1212SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) 
     13 
     14IF(MSVC) 
     15  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4250 /wd4355 /wd4800 /wd4996") 
     16# Suppressed warnings: 
     17# C4250: 'class1' : inherits 'class2::member' via dominance 
     18# C4355: 'this' : used in base member initializer list 
     19# C4800: 'type' : forcing value to bool 'true' or 'false' (performance warning) 
     20# C4996: 'function': was declared deprecated 
     21ENDIF(MSVC) 
    1322 
    1423INCLUDE(FindDoxygen) 
Note: See TracChangeset for help on using the changeset viewer.