diff options
| -rw-r--r-- | bison.pri | 4 | ||||
| -rw-r--r-- | boost.pri | 3 | ||||
| -rw-r--r-- | eigen2.pri | 1 | ||||
| -rw-r--r-- | flex.pri | 4 | ||||
| -rw-r--r-- | openscad.pro | 9 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | tests/FindGLEW.cmake | 4 |
7 files changed, 29 insertions, 3 deletions
@@ -22,6 +22,10 @@ unix:freebsd-g++ { QMAKE_YACC = /usr/local/bin/bison } +unix:netbsd* { + QMAKE_YACC = /usr/pkg/bin/bison +} + unix:linux* { exists(/usr/bin/bison) { QMAKE_YACC = /usr/bin/bison @@ -52,7 +52,8 @@ boost { unix { BMT_TEST1 = /usr/lib64/libboost*thread-mt* BMT_TEST2 = /usr/lib/libboost*thread-mt* - exists($$BMT_TEST1)|exists($$BMT_TEST2) { + BMT_TEST3 = /usr/pkg/lib/libboost*thread-mt* # netbsd + exists($$BMT_TEST1)|exists($$BMT_TEST2)|exists($$BMT_TEST3) { BOOST_LINK_FLAGS = -lboost_thread-mt -lboost_program_options-mt } } @@ -29,6 +29,7 @@ eigen2 { freebsd-g++: EIGEN2_INCLUDEPATH = /usr/local/include/eigen2 macx: EIGEN2_INCLUDEPATH = /opt/local/include/eigen2 linux*: EIGEN2_INCLUDEPATH = /usr/include/eigen2 + netbsd*: EIGEN2_INCLUDEPATH = /usr/pkg/include/eigen2 } # eigen2 being under 'include/eigen2' needs special prepending @@ -13,6 +13,10 @@ unix:freebsd-g++ { QMAKE_LEX = /usr/local/bin/flex } +unix:netbsd* { + QMAKE_LEX = /usr/pkg/bin/flex +} + unix:linux* { exists(/usr/bin/flex) { QMAKE_LEX = /usr/bin/flex diff --git a/openscad.pro b/openscad.pro index 0feca74..b26122a 100644 --- a/openscad.pro +++ b/openscad.pro @@ -86,6 +86,15 @@ linux*:exists(/usr/lib64/libGLU*)|linux*:exists(/usr/lib/libGLU*) { LIBS += -lGLU } +netbsd* { + LIBS += -L/usr/X11R7/lib + QMAKE_LFLAGS += -Wl,-R/usr/X11R7/lib + QMAKE_LFLAGS += -Wl,-R/usr/pkg/lib + !isEmpty(OPENSCAD_LIBDIR) { + QMAKE_LFLAGS += -Wl,-R$$OPENSCAD_LIBDIR/lib + } +} + # See Dec 2011 OpenSCAD mailing list, re: CGAL/GCC bugs. *g++* { QMAKE_CXXFLAGS *= -fno-strict-aliasing diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index e2920d8..78ef647 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -177,6 +177,8 @@ if (NOT EIGEN2_INCLUDE_DIR) endif() if (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") set(EIGEN2_FIND_PATHS /usr/local/include/eigen2) + elseif (${CMAKE_SYSTEM_NAME} MATCHES "NetBSD") + set(EIGEN2_FIND_PATHS /usr/pkg/include/eigen2) else() set(EIGEN2_FIND_PATHS /opt/local/include/eigen2 /usr/include/eigen2) endif() @@ -239,6 +241,11 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") set(FLEX_EXECUTABLE /usr/local/bin/flex) endif() +if(${CMAKE_SYSTEM_NAME} MATCHES "NetBSD") + include_directories( /usr/pkg/include /usr/X11R7/include ) + set(FLEX_EXECUTABLE /usr/pkg/bin/flex) +endif() + find_package(FLEX REQUIRED) # The COMPILE_FLAGS and forced C++ compiler is just to be compatible with qmake if (WIN32) diff --git a/tests/FindGLEW.cmake b/tests/FindGLEW.cmake index 286fae8..1b0cac4 100644 --- a/tests/FindGLEW.cmake +++ b/tests/FindGLEW.cmake @@ -37,13 +37,13 @@ ELSE (WIN32) message(STATUS "GLEW_DIR: " ${GLEW_DIR}) FIND_PATH( GLEW_INCLUDE_PATH GL/glew.h HINTS ${GLEW_DIR}/include - PATHS /usr/include /usr/local/include + PATHS /usr/include /usr/local/include /usr/pkg/include NO_DEFAULT_PATH DOC "The directory where GL/glew.h resides") FIND_LIBRARY( GLEW_LIBRARY NAMES GLEW glew HINTS ${GLEW_DIR}/lib - PATHS /usr/lib /usr/local/lib + PATHS /usr/lib /usr/local/lib /usr/pkg/lib NO_DEFAULT_PATH DOC "The GLEW library") ENDIF (WIN32) |