diff options
| author | don bright <hugh.m.bright@gmail.com> | 2013-02-03 01:40:26 (GMT) |
|---|---|---|
| committer | don bright <hugh.m.bright@gmail.com> | 2013-02-03 01:40:26 (GMT) |
| commit | 44cddd0b3cf69b1e10811f0000c0ddef02c15d58 (patch) | |
| tree | 536dc65cf43152e3934ac123086afa9d9d648483 /tests/CMakeLists.txt | |
| parent | b390d54471201731db1158fa21aa54fcef1f7582 (diff) | |
| parent | e5448f5e69f6d59256ba1816acf2647e808e10db (diff) | |
Merge branch 'master' of github.com:openscad/openscad into cmake_workaround
Conflicts:
tests/virtualfb.sh
Diffstat (limited to 'tests/CMakeLists.txt')
| -rw-r--r-- | tests/CMakeLists.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 611cb5f..8b7a252 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -179,6 +179,11 @@ endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") set(CMAKE_INCLUDE_DIRECTORIES_BEFORE ON) find_package(OpenGL REQUIRED) +if ( "${OPENGL_glu_LIBRARY}" MATCHES "NOTFOUND" ) + # GLU and Mesa split in late 2012 so some systems dont have GLU + find_library(OPENGL_glu_LIBRARY GLU HINTS "$ENV{OPENSCAD_LIBRARIES}/lib" REQUIRED) + set( OPENGL_LIBRARY ${OPENGL_glu_LIBRARY} ${OPENGL_LIBRARY} ) +endif() if (MINGW_CROSS_ENV_DIR) mingw_cross_env_find_qt() |