bug3506fix.diff
| cmake/FindQwtPolar.cmake (working copy) | ||
|---|---|---|
| 13 | 13 |
# |
| 14 | 14 | |
| 15 | 15 | |
| 16 |
#MESSAGE("Searching for QWTPolar")
|
|
| 16 |
#MESSAGE("Searching for QwtPolar")
|
|
| 17 | 17 |
FIND_PATH(QWTPOLAR_INCLUDE_DIR NAMES qwt_polar.h PATHS |
| 18 | 18 |
/usr/include |
| 19 | 19 |
/usr/local/include |
| 20 | 20 |
"$ENV{LIB_DIR}/include"
|
| 21 | 21 |
"$ENV{INCLUDE}"
|
| 22 |
PATH_SUFFIXES qwt-qt4 qwt qwt5
|
|
| 22 |
PATH_SUFFIXES qwtpolar
|
|
| 23 | 23 |
) |
| 24 | 24 | |
| 25 | 25 |
FIND_LIBRARY(QWTPOLAR_LIBRARY NAMES qwtpolar PATHS |
| ... | ... | |
| 35 | 35 | |
| 36 | 36 |
IF (QWTPOLAR_FOUND) |
| 37 | 37 |
IF (NOT QWTPOLAR_FIND_QUIETLY) |
| 38 |
MESSAGE(STATUS "Found QWTPolar: ${QWTPOLAR_LIBRARY}")
|
|
| 38 |
MESSAGE(STATUS "Found QwtPolar: ${QWTPOLAR_LIBRARY}")
|
|
| 39 | 39 |
ENDIF (NOT QWTPOLAR_FIND_QUIETLY) |
| 40 | 40 |
ELSE (QWTPOLAR_FOUND) |
| 41 | 41 |
IF (QWTPOLAR_FIND_REQUIRED) |
| 42 |
MESSAGE(FATAL_ERROR "Could not find QWTPolar")
|
|
| 42 |
MESSAGE(FATAL_ERROR "Could not find QwtPolar")
|
|
| 43 | 43 |
ENDIF (QWTPOLAR_FIND_REQUIRED) |
| 44 | 44 |
ENDIF (QWTPOLAR_FOUND) |
| cmake/FindQwt.cmake (working copy) | ||
|---|---|---|
| 12 | 12 |
# |
| 13 | 13 | |
| 14 | 14 | |
| 15 |
#MESSAGE("Searching for QWT")
|
|
| 15 |
#MESSAGE("Searching for Qwt")
|
|
| 16 | 16 |
FIND_PATH(QWT_INCLUDE_DIR NAMES qwt.h PATHS |
| 17 | 17 |
/usr/include |
| 18 | 18 |
/usr/local/include |
| ... | ... | |
| 34 | 34 | |
| 35 | 35 |
IF (QWT_FOUND) |
| 36 | 36 |
IF (NOT QWT_FIND_QUIETLY) |
| 37 |
MESSAGE(STATUS "Found QWT: ${QWT_LIBRARY}")
|
|
| 37 |
MESSAGE(STATUS "Found Qwt: ${QWT_LIBRARY}")
|
|
| 38 | 38 |
ENDIF (NOT QWT_FIND_QUIETLY) |
| 39 | 39 |
ELSE (QWT_FOUND) |
| 40 | 40 |
IF (QWT_FIND_REQUIRED) |
| 41 |
MESSAGE(FATAL_ERROR "Could not find QWT")
|
|
| 41 |
MESSAGE(FATAL_ERROR "Could not find Qwt")
|
|
| 42 | 42 |
ENDIF (QWT_FIND_REQUIRED) |
| 43 | 43 |
ENDIF (QWT_FOUND) |
| cmake/FindQWT.cmake (working copy) | ||
|---|---|---|
| 1 |
# Find Qwt |
|
| 2 |
# ~~~~~~~~ |
|
| 3 |
# Copyright (c) 2010, Tim Sutton <tim at linfiniti.com> |
|
| 4 |
# Redistribution and use is allowed according to the terms of the BSD license. |
|
| 5 |
# For details see the accompanying COPYING-CMAKE-SCRIPTS file. |
|
| 6 |
# |
|
| 7 |
# Once run this will define: |
|
| 8 |
# |
|
| 9 |
# QWT_FOUND = system has QWT lib |
|
| 10 |
# QWT_LIBRARY = full path to the QWT library |
|
| 11 |
# QWT_INCLUDE_DIR = where to find headers |
|
| 12 |
# |
|
| 13 | ||
| 14 | ||
| 15 |
#MESSAGE("Searching for QWT")
|
|
| 16 |
FIND_PATH(QWT_INCLUDE_DIR NAMES qwt.h PATHS |
|
| 17 |
/usr/include |
|
| 18 |
/usr/local/include |
|
| 19 |
"$ENV{LIB_DIR}/include"
|
|
| 20 |
"$ENV{INCLUDE}"
|
|
| 21 |
PATH_SUFFIXES qwt-qt4 qwt qwt5 |
|
| 22 |
) |
|
| 23 | ||
| 24 |
FIND_LIBRARY(QWT_LIBRARY NAMES qwt qwt5 qwt-qt4 qwt5-qt4 PATHS |
|
| 25 |
/usr/lib |
|
| 26 |
/usr/local/lib |
|
| 27 |
"$ENV{LIB_DIR}/lib"
|
|
| 28 |
"$ENV{LIB}/lib"
|
|
| 29 |
) |
|
| 30 | ||
| 31 |
IF (QWT_INCLUDE_DIR AND QWT_LIBRARY) |
|
| 32 |
SET(QWT_FOUND TRUE) |
|
| 33 |
ENDIF (QWT_INCLUDE_DIR AND QWT_LIBRARY) |
|
| 34 | ||
| 35 |
IF (QWT_FOUND) |
|
| 36 |
IF (NOT QWT_FIND_QUIETLY) |
|
| 37 |
MESSAGE(STATUS "Found QWT: ${QWT_LIBRARY}")
|
|
| 38 |
ENDIF (NOT QWT_FIND_QUIETLY) |
|
| 39 |
ELSE (QWT_FOUND) |
|
| 40 |
IF (QWT_FIND_REQUIRED) |
|
| 41 |
MESSAGE(FATAL_ERROR "Could not find QWT") |
|
| 42 |
ENDIF (QWT_FIND_REQUIRED) |
|
| 43 |
ENDIF (QWT_FOUND) |
|
| CMakeLists.txt (working copy) | ||
|---|---|---|
| 142 | 142 |
FIND_PACKAGE(GSL) # Georeferencer |
| 143 | 143 |
FIND_PACKAGE(GEOS) |
| 144 | 144 |
FIND_PACKAGE(GDAL) |
| 145 |
FIND_PACKAGE(QWT REQUIRED)
|
|
| 145 |
FIND_PACKAGE(Qwt REQUIRED)
|
|
| 146 | 146 |
IF (NOT WITH_INTERNAL_QWTPOLAR) |
| 147 |
FIND_PACKAGE(QWTPOLAR REQUIRED)
|
|
| 147 |
FIND_PACKAGE(QwtPolar REQUIRED)
|
|
| 148 | 148 |
ENDIF(NOT WITH_INTERNAL_QWTPOLAR) |
| 149 | 149 | |
| 150 | 150 |
IF (NOT WITH_INTERNAL_SPATIALITE) |