From 3b31719b7d20aa2b5cfb76a63422ed722c940abc Mon Sep 17 00:00:00 2001 From: salinasd Date: Wed, 17 Dec 2014 08:47:19 +0000 Subject: CMakeLists.txt git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@361 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: b8cd7c1570e1180a9f1f6ff098c3ef177a0d0f6d --- src/CMakeLists.txt | 11 ++++++----- src/Contraction/example/Rips_contraction.cpp | 2 +- src/common/include/gudhi/Utils.h | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c209a020..dcdf6e87 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -4,14 +4,15 @@ project(GUDHI) find_package(Boost REQUIRED COMPONENTS system filesystem program_options chrono timer REQUIRED) + +if (NOT CMAKE_BUILD_TYPE) + set(CMAKE_BUILD_TYPE "Release") +endif() if(MSVC) - # Turn off some VC++ warnings SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4267 /wd4668 /wd4311 /wd4800 /wd4820 /wd4503 /wd4244 /wd4345 /wd4996 /wd4396 /wd4018") else() - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -std=c++11 -Wall -Wpedantic") - set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g -O0") - set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}") -endif() + list(APPEND CMAKE_CXX_FLAGS "-std=c++11") +endif() # BOOST ISSUE result_of vs C++11 add_definitions(-DBOOST_RESULT_OF_USE_DECLTYPE) diff --git a/src/Contraction/example/Rips_contraction.cpp b/src/Contraction/example/Rips_contraction.cpp index 0cea479b..869a3682 100644 --- a/src/Contraction/example/Rips_contraction.cpp +++ b/src/Contraction/example/Rips_contraction.cpp @@ -96,7 +96,7 @@ int main (int argc, char *argv[]) std::cout << "Resulting complex has "<< complex.num_vertices()<<" vertices, "<< - complex.num_edges()<<"edges and "<< + complex.num_edges()<<" edges and "<< complex.num_blockers()<<" blockers"<