From: <mar...@us...> - 2011-09-30 13:59:53
|
Revision: 4819 http://navit.svn.sourceforge.net/navit/?rev=4819&view=rev Author: martin-s Date: 2011-09-30 13:59:46 +0000 (Fri, 30 Sep 2011) Log Message: ----------- Fix:Core:Option to skip qt detection Modified Paths: -------------- trunk/navit/CMakeLists.txt Modified: trunk/navit/CMakeLists.txt =================================================================== --- trunk/navit/CMakeLists.txt 2011-09-30 13:34:17 UTC (rev 4818) +++ trunk/navit/CMakeLists.txt 2011-09-30 13:59:46 UTC (rev 4819) @@ -92,10 +92,12 @@ find_package(Threads) libfind_pkg_check_modules(FONTCONFIG fontconfig) #Qt detection -SET(QT_USE_QTSVG TRUE) -SET(QT_USE_QTXML TRUE) -SET(QT_USE_QTDECLARATIVE TRUE) -find_package(Qt4 COMPONENTS QtCore QtGui QtXml QtDeclarative QtSvg OPTIONAL) +if (NOT DISABLE_QT) + SET(QT_USE_QTSVG TRUE) + SET(QT_USE_QTXML TRUE) + SET(QT_USE_QTDECLARATIVE TRUE) + find_package(Qt4 COMPONENTS QtCore QtGui QtXml QtDeclarative QtSvg OPTIONAL) +endif (NOT DISABLE_QT) #pkg-config based detection find_package(PkgConfig) if(PKG_CONFIG_FOUND) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |