diff options
| author | don <don@lyubov.(none)> | 2011-12-26 18:51:30 (GMT) |
|---|---|---|
| committer | don <don@lyubov.(none)> | 2011-12-26 18:51:30 (GMT) |
| commit | 058299923379fa72145daf754342801f3a192903 (patch) | |
| tree | c4227f014bdf79c47700579d92fc0e1af0a154c1 | |
| parent | 4a16db46574e3774df5f34d9a282d21fc291b243 (diff) | |
print boost_root when it's under OPENSCAD_LIBRARIES, otherwise skip print
| -rw-r--r-- | openscad.pro | 2 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/openscad.pro b/openscad.pro index 50a419d..53f8a36 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 74670c5..0e8e055 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 "") |