diff options
| author | Marius Kintel <marius@kintel.net> | 2013-05-25 19:21:17 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-05-25 19:21:17 (GMT) |
| commit | 9740232b080ac3d2fe87309fb51a892faf6ea913 (patch) | |
| tree | 974ac256413de1111a085d12cad7bc3f755792dd /tests/CMakeLists.txt | |
| parent | fef8dba56bae76f6e876656cee603fc895fa0955 (diff) | |
| parent | e60744776193d5dc3f22e7a4a9f3afa8b8664e30 (diff) | |
Merge branch 'master' into issue364
Diffstat (limited to 'tests/CMakeLists.txt')
| -rw-r--r-- | tests/CMakeLists.txt | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 9821d70..14416ce 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -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 "") @@ -822,9 +834,7 @@ disable_tests(cgalpngtest_child-background openscad-cgalpng_child-background openscad-cgalpng_highlight-and-background-modifier openscad-cgalpng_testcolornames - throwntogethertest_child-background - throwntogethertest_highlight-and-background-modifier - throwntogethertest_testcolornames) + throwntogethertest_highlight-and-background-modifier) # Test config handling |