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

Merge pull request #370 from openscad/gcc110fix 

Gcc110fix
epec-fast
Marius Kintel 2013-05-23 21:14:34 -07:00
parent 71ab237aad 85a6cf92fe
commit 95e399e06c
2 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
scripts/uni-build-dependencies.sh
View File

@ -408,8 +408,21 @@ build_opencsg()
OPENCSG_QMAKE=qmake-qt4
elif [ "`command -v qmake4`" ]; then
OPENCSG_QMAKE=qmake4
else
elif [ "`command -v qmake`" ]; then
OPENCSG_QMAKE=qmake
else
echo qmake not found... using standard OpenCSG makefiles
OPENCSG_QMAKE=make
cp Makefile Makefile.bak
cp src/Makefile src/Makefile.bak
cat Makefile.bak | sed s/example// |sed s/glew// > Makefile
cat src/Makefile.bak | sed s@^INCPATH.*@INCPATH\ =\ -I$BASEDIR/include\ -I../include\ -I..\ -I.@ > src/Makefile
cp src/Makefile src/Makefile.bak2
cat src/Makefile.bak2 | sed s@^LIBS.*@LIBS\ =\ -L$BASEDIR/lib\ -L/usr/X11R6/lib\ -lGLU\ -lGL@ > src/Makefile
tmp=$version
build_glu 9.0.0 # todo - autodetect the need for glu
version=$tmp
fi
cd $BASEDIR/src/OpenCSG-$version/src
@ -562,7 +575,7 @@ fi
build_eigen 3.1.1
build_gmp 5.0.5
build_mpfr 3.1.1
build_boost 1.49.0
build_boost 1.53.0
# NB! For CGAL, also update the actual download URL in the function
build_cgal 4.1
build_glew 1.9.0

12
tests/CMakeLists.txt
View File

@ -252,6 +252,18 @@ endif()
# OpenGL
find_package(OpenGL REQUIRED)
if (NOT OPENGL_GLU_FOUND)
message(STATUS "GLU not found in system paths...searching $ENV{OPENSCAD_LIBRARIES} ")
find_library(OPENGL_glu_LIBRARY GLU HINTS $ENV{OPENSCAD_LIBRARIES}/lib)
if (NOT OPENGL_glu_LIBRARY)
message(FATAL "GLU library not found")
endif()
set(OPENGL_LIBRARIES ${OPENGL_glu_LIBRARY} ${OPENGL_LIBRARIES})
message(STATUS "OpenGL LIBRARIES: ")
foreach(GLLIB ${OPENGL_LIBRARIES})
message(STATUS " " ${GLLIB})
endforeach()
endif()
# OpenCSG
if (NOT $ENV{OPENCSGDIR} STREQUAL "")