From 058299923379fa72145daf754342801f3a192903 Mon Sep 17 00:00:00 2001
From: don <don@lyubov.(none)>
Date: Mon, 26 Dec 2011 12:51:30 -0600
Subject: [PATCH] print boost_root when it's under OPENSCAD_LIBRARIES,
 otherwise skip print

---
 openscad.pro         | 2 +-
 tests/CMakeLists.txt | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/openscad.pro b/openscad.pro
index 50a419dc..53f8a361 100644
--- a/openscad.pro
+++ b/openscad.pro
@@ -88,7 +88,7 @@ linux*:exists(/usr/lib64/libGLU*)|linux*:exists(/usr/lib/libGLU*) {
 
 # See Dec 2011 OpenSCAD mailing list, re: CGAL/GCC bugs.
 *g++* {
-  QMAKE_CXXFLAGS *= -fno-strict-aliasing
+  QMAKE_CXXFLAGS *= -fstrict-aliasing -Wstrict-aliasing
 }
 
 CONFIG(mingw-cross-env) {
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 74670c5b..0e8e055c 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -77,10 +77,11 @@ endif()
 if (NOT $ENV{OPENSCAD_LIBRARIES} STREQUAL "")
   set(BOOST_ROOT "$ENV{OPENSCAD_LIBRARIES}")
   if (EXISTS ${BOOST_ROOT}/include/boost)
-    # workaround bugs in FindBoost.cmake with multiple versions of boost
+    # if boost is under OPENSCAD_LIBRARIES, then 
+    # don't look in the system paths (workaround FindBoost.cmake bug)
     set(Boost_NO_SYSTEM_PATHS "TRUE")
+    message(STATUS "BOOST_ROOT: " ${BOOST_ROOT})
   endif()
-  message(STATUS "BOOST_ROOT: " ${BOOST_ROOT})
 endif()
 
 if (NOT $ENV{BOOSTDIR} STREQUAL "")