From f4e1187c7a7d6b1111e9e961c5b03fb9c1b62ace Mon Sep 17 00:00:00 2001 From: Nabil Stendardo Date: Sun, 11 Nov 2012 22:25:00 +0100 Subject: [PATCH 1/2] Added reference to environment variable BOOST_NO_SYSTEM_PATHS to Makefile. If set, it will set the cmake variable Boost_NO_SYSTEM_PATHS to true, meaning it will ignore all boost installations outside the boost root. --- Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile b/Makefile index 2510e91b5..053d48208 100644 --- a/Makefile +++ b/Makefile @@ -83,6 +83,10 @@ ifdef PROFILE MY_CMAKE_FLAGS += -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo endif +ifdef BOOST_NO_SYSTEM_PATHS +MY_CMAKE_FLAGS += -DBoost_NO_SYSTEM_PATHS:BOOL=TRUE +endif + ifneq (${MYCC},) MY_CMAKE_FLAGS += -DCMAKE_C_COMPILER:STRING=${MYCC} endif From c684cf5121c185f750134b4b78cbf3b4cec6ae15 Mon Sep 17 00:00:00 2001 From: Nabil Stendardo Date: Sun, 11 Nov 2012 22:32:55 +0100 Subject: [PATCH 2/2] Remove "-Werror" from command line. It raises errors on recent versions of GCC due to narrowing conversions (which are illegal in C++11). It's IMHO not a good idea to add "-Werror" by default in any public code anyone might be interested in downloading while not being a developer of that particular code.(it should be added as a local variable in the environment of its developers). --- src/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3dcf2c704..897917fac 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -49,9 +49,9 @@ if (NOT CMAKE_COMPILER_IS_CLANG) endif () endif () -## turn on more detailed warnings and consider warnings as errors +## turn on more detailed warnings if (NOT MSVC) - add_definitions ("-Wall -Werror") + add_definitions ("-Wall") endif () ## disable RTTI