diff options
| author | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2012-03-03 19:35:19 +0000 |
|---|---|---|
| committer | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2012-03-03 19:35:19 +0000 |
| commit | eb2153db85717960d2f9f0067febf92a6ef3be6d (patch) | |
| tree | b1f815209861d443c6830a89455bb3392fdf82c1 /CMakeLists.txt | |
| parent | 0e82cc15c4386796a6d48c388413ec12570ac177 (diff) | |
| download | navit-svn-eb2153db85717960d2f9f0067febf92a6ef3be6d.tar.gz | |
Fix:Build:graphics_opengl cmake support
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@4957 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'CMakeLists.txt')
| -rwxr-xr-x | CMakeLists.txt | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 83cad502..2a69b93b 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -237,12 +237,16 @@ if(GTK2_FOUND) endif(FREETYPE_FOUND) endif(GTK2_FOUND) -CHECK_LIBRARY_EXISTS(freeimage FreeImage_Load "" FREEIMAGE_FOUND) -if (QUESOGLC_FOUND AND FREETYPE_FOUND) - if (OPENGL_FOUND AND OPENGL_GLU_FOUND AND OPENGL_GLUT_FOUND AND OPENGL_INCLUDE_DIR AND FREEIMAGE_FOUND) +CHECK_LIBRARY_EXISTS(freeimage FreeImage_Load "" HAVE_FREEIMAGE) +if (FREETYPE_FOUND) + if (OPENGL_FOUND AND OPENGL_GLU_FOUND AND GLUT_FOUND AND OPENGL_INCLUDE_DIR) message (STATUS "opengl found: ${OPENGL_gl_LIBRARY}") include_directories(${OPENGL_INCLUDE_DIR}) - set_with_reason(graphics/opengl "Found OpenGL and Quesoglc" TRUE ${OPENGL_gl_LIBRARY};${OPENGL_glu_LIBRARY};${GLUT_glut_LIBRARY};freeimage) + set(GRAPHICS_OPENGL_LIBRARY ${OPENGL_gl_LIBRARY};${OPENGL_glu_LIBRARY};${GLUT_glut_LIBRARY}) + if (HAVE_FREEIMAGE) + list(APPEND GRAPHICS_OPENGL_LIBRARY freeimage) + endif(HAVE_FREEIMAGE) + set_with_reason(graphics/opengl "Found OpenGL" TRUE ${GRAPHICS_OPENGL_LIBRARY}) else() message (STATUS "opengl not found") endif() |