diff options
| author | Don Bright <hugh.m.bright@gmail.com> | 2011-10-19 01:57:27 (GMT) |
|---|---|---|
| committer | Don Bright <hugh.m.bright@gmail.com> | 2011-10-19 01:57:27 (GMT) |
| commit | 2325f621d81cee0e1514e3d30868ec1e2a2a3667 (patch) | |
| tree | 9165cdf4a688b45952fe054c7975cf4aeaa3f93b /tests | |
| parent | 40b1b4ac278055eba6887f2ece721e0b6438b8b3 (diff) | |
| parent | 1a1ab5b5ab926652293d509b0fd4d7f57451c794 (diff) | |
Merge branch 'visitortests' of github.com:donbright/openscad into visitortests
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/CMakeLists.txt | 15 | ||||
| -rw-r--r-- | tests/OffscreenContext.cc | 2 |
2 files changed, 15 insertions, 2 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 1a73254..40286dd 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -74,13 +74,20 @@ include(${QT_USE_FILE}) # Turn off Eigen SIMD optimization if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DEIGEN_DONT_ALIGN") + if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DEIGEN_DONT_ALIGN") + endif() endif() if (NOT EIGEN2_INCLUDE_DIR) find_path(EIGEN2_INCLUDE_DIR Eigen/Core PATHS ENV EIGEN2DIR /opt/local/include/eigen2 /usr/include/eigen2) + if (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") + find_path(EIGEN2_INCLUDE_DIR + Eigen/Core + PATHS ENV EIGEN2DIR /usr/local/include/eigen2 ) + endif() if (NOT EIGEN2_INCLUDE_DIR) message(FATAL_ERROR "Eigen2 not found") else() @@ -126,6 +133,12 @@ endif() # Flex/Bison find_package(BISON) + +if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") + # FreeBSD has an old flex in /usr/bin and a new flex in /usr/local/bin + set(FLEX_EXECUTABLE /usr/local/bin/flex) +endif() + find_package(FLEX) # The COMPILE_FLAGS and forced C++ compiler is just to be compatible with qmake if (WIN32) diff --git a/tests/OffscreenContext.cc b/tests/OffscreenContext.cc index 727e771..7a3637c 100644 --- a/tests/OffscreenContext.cc +++ b/tests/OffscreenContext.cc @@ -1,4 +1,4 @@ -/* +/* Create an OpenGL context without creating an OpenGL Window. for Linux. |