vitalif
/
openscad
mirror of https://github.com/vitalif/openscad
1
0
Fork 0
Code Issues Releases Wiki Activity

print boost_root when it's under OPENSCAD_LIBRARIES, otherwise skip print

felipesanches-svg
don 2011-12-26 12:51:30 -06:00
parent 4a16db4657
commit 0582999233
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openscad.pro
View File

@ -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) {

5
tests/CMakeLists.txt
View File

@ -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 "")