a few fixes for netbsd

epec-fast
Don Bright 2013-06-08 23:49:21 -05:00
parent d27ab64d45
commit 49af42cfd0
4 changed files with 25 additions and 5 deletions

View File

@ -107,6 +107,7 @@ netbsd* {
QMAKE_LFLAGS += -L/usr/X11R7/lib
QMAKE_LFLAGS += -Wl,-R/usr/X11R7/lib
QMAKE_LFLAGS += -Wl,-R/usr/pkg/lib
!clang: { QMAKE_CXXFLAGS += -std=c++0x }
!isEmpty(OPENSCAD_LIBDIR) {
QMAKE_CFLAGS = -I$$OPENSCAD_LIBDIR/include $$QMAKE_CFLAGS
QMAKE_CXXFLAGS = -I$$OPENSCAD_LIBDIR/include $$QMAKE_CXXFLAGS

View File

@ -290,11 +290,26 @@ build_cgal()
ver3_7="curl --insecure -O https://gforge.inria.fr/frs/download.php/27641/CGAL-3.7.tar.gz"
vernull="echo already downloaded..skipping"
download_cmd=ver`echo $version | sed s/"\."/"_"/`
if [ -e CGAL-$version.tar.gz ]; then download_cmd=vernull; fi
if [ -e CGAL-$version.tar.bz2 ]; then download_cmd=vernull; fi
if [ -e CGAL-$version.tar.gz ]; then
download_cmd=vernull;
fi
if [ -e CGAL-$version.tar.bz2 ]; then
download_cmd=vernull;
fi
`eval echo "$"$download_cmd`
if [ -e CGAL-$version.tar.gz ]; then tar xf CGAL-$version.tar.gz; fi
if [ -e CGAL-$version.tar.bz2 ]; then tar xf CGAL-$version.tar.bz2; fi
zipper=gzip
suffix=gz
if [ -e CGAL-$version.tar.bz2 ]; then
zipper=bzip2
suffix=bz2
fi
$zipper -f -d CGAL-$version.tar.$suffix;
tar xf CGAL-$version.tar
cd CGAL-$version
# older cmakes have buggy FindBoost that can result in

View File

@ -35,7 +35,8 @@ get_freebsd_deps()
get_netbsd_deps()
{
sudo pkgin install bison boost cmake git bash eigen flex gmake gmp mpfr \
qt4 glew cgal opencsg modular-xorg python27 py27-paramiko curl imagemagick
qt4 glew cgal opencsg modular-xorg python27 py27-paramiko curl \
imagemagick ImageMagick
}
get_opensuse_deps()

View File

@ -333,6 +333,9 @@ endif()
if(${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
include_directories( /usr/pkg/include /usr/X11R7/include )
set(FLEX_EXECUTABLE /usr/pkg/bin/flex)
if(NOT ${CMAKE_CXX_COMPILER} MATCHES ".*clang.*")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
endif()
endif()
find_package(FLEX REQUIRED)