diff options
| author | sleske <sleske@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2012-10-16 19:56:47 +0000 |
|---|---|---|
| committer | sleske <sleske@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2012-10-16 19:56:47 +0000 |
| commit | c83664ec1e18331f9fdd03c8beec5e826ebbb4e9 (patch) | |
| tree | 9db924169488fd0a03e2b0feab4f315cc5803387 /CMakeLists.txt | |
| parent | 5a6ae2bae30926b865ccc409a1f456ac580e63f7 (diff) | |
| download | navit-svn-c83664ec1e18331f9fdd03c8beec5e826ebbb4e9.tar.gz | |
Fix:build/cmake:Remove invalid parameter OPTIONAL from find_package(Qt4...). Remove copy&pasted CMake-scripts for Qt4. Require Qt 4.7.|Fixes #903
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5251 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'CMakeLists.txt')
| -rwxr-xr-x | CMakeLists.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ecd5030f..5637f9e6 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -120,10 +120,10 @@ find_package(Threads) libfind_pkg_check_modules(FONTCONFIG fontconfig) #Qt detection 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) + # Unfortunately, CMake seems to ignore the "OPTIONAL_COMPONENTS" flag, + # and actually requires all components to be installed. Maybe this can + # be fixed later... + find_package(Qt4 4.7 COMPONENTS QtCore OPTIONAL_COMPONENTS QtGui QtXml QtDeclarative QtSvg) endif (NOT DISABLE_QT) #pkg-config based detection find_package(PkgConfig) |