COIN-OR::LEMON - Graph Library

Ticket #418: 64260c0f58eb.patch

File 64260c0f58eb.patch, 1.4 KB (added by Alpar Juttner, 8 years ago)
  • CMakeLists.txt

    # HG changeset patch
    # User Alpar Juttner <alpar@cs.elte.hu>
    # Date 1302188255 -7200
    # Node ID 64260c0f58eb25c9bf6563793f7bacbfcc0a14bb
    # Parent  16d466589b54343660684094593caaa09188c928
    Better Win CodeBlock/MinGW support (#418)
     - Remove -ansi compilation flag
     - Don't include sys/times.h when WIN32 is defined
    
    diff --git a/CMakeLists.txt b/CMakeLists.txt
    a b  
    5151  SET(CXX_WARNING $ENV{LEMON_CXX_WARNING})
    5252ELSE()
    5353  IF(CMAKE_COMPILER_IS_GNUCXX)
    54     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")
     54    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")
    5555    SET(CMAKE_CXX_FLAGS_DEBUG CACHE STRING "-ggdb")
    5656    SET(CMAKE_C_FLAGS_DEBUG CACHE STRING "-ggdb")
    5757  ELSEIF(MSVC)
  • lemon/bits/windows.cc

    diff --git a/lemon/bits/windows.cc b/lemon/bits/windows.cc
    a b  
    4040#else
    4141#include <unistd.h>
    4242#include <ctime>
     43#ifndef WIN32
    4344#include <sys/times.h>
     45#endif
    4446#include <sys/time.h>
    4547#endif
    4648