summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormartin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220>2011-07-27 20:58:11 +0000
committermartin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220>2011-07-27 20:58:11 +0000
commit13bf797f8b293604a4e843fd512974208d049508 (patch)
tree4f7b8d6c90c7a0ba6bb00635397805c3a652cefd
parent7aa45622cb54409366ca16e43144a48112fabf47 (diff)
downloadnavit-svn-13bf797f8b293604a4e843fd512974208d049508.tar.gz
Fix:Build:Make c++ compiler optional
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@4661 ffa7fe5e-494d-0410-b361-a75ebd5db220
-rw-r--r--CMakeLists.txt9
1 files changed, 7 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cdbb5819..9cc06f01 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,9 @@
-project(navit)
+project(navit C)
+
+if(DEFINED CMAKE_CXX_COMPILER AND CMAKE_CXX_COMPILER MATCHES "^$")
+ set(CMAKE_CXX_COMPILER CMAKE_CXX_COMPILER-NOTFOUND)
+endif(DEFINED CMAKE_CXX_COMPILER AND CMAKE_CXX_COMPILER MATCHES "^$")
+enable_language(CXX OPTIONAL)
cmake_minimum_required(VERSION 2.6)
cmake_policy(VERSION 2.6)
@@ -223,7 +228,7 @@ 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_INCLUDE_DIR AND FREEIMAGE_FOUND)
+ if (OPENGL_FOUND AND OPENGL_GLU_FOUND AND OPENGL_GLUT_FOUND AND OPENGL_INCLUDE_DIR AND FREEIMAGE_FOUND)
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)