Attachment #904177 for bug #935730

View | Details | Raw Unified | Return to bug 935730
Collapse All | Expand All




# QWTPOLAR_INCLUDE_DIR = where to find headers 
#

#FIND_LIBRARY(QWTPOLAR_LIBRARY NAMES qwtpolar PATHS 
#  /usr/lib
#  /usr/local/lib
#  "$ENV{LIB_DIR}/lib" 
#  "$ENV{LIB}/lib" 
#  )

#SET(_qwtpolar_fw)
#IF (QWTPOLAR_LIBRARY MATCHES "/qwtpolar.*\\.framework")
#  STRING(REGEX REPLACE "^(.*/qwtpolar.*\\.framework).*$" "\\1" _qwtpolar_fw "${QWTPOLAR_LIBRARY}")
#ENDIF ()

#FIND_PATH(QWTPOLAR_INCLUDE_DIR NAMES qwt_polar.h PATHS
#  "${_qwtpolar_fw}/Headers"
#  /usr/include
#  /usr/local/include
#  "$ENV{LIB_DIR}/include"
#  "$ENV{INCLUDE}"
#  PATH_SUFFIXES qwtpolar qwt
#  )

#IF (QWTPOLAR_INCLUDE_DIR AND QWTPOLAR_LIBRARY)
#  SET(QWTPOLAR_FOUND TRUE)
#ENDIF (QWTPOLAR_INCLUDE_DIR AND QWTPOLAR_LIBRARY)

#IF (QWTPOLAR_FOUND)
#  IF (NOT QWTPOLAR_FIND_QUIETLY)
#    MESSAGE(STATUS "Found QwtPolar: ${QWTPOLAR_LIBRARY}")
#  ENDIF (NOT QWTPOLAR_FIND_QUIETLY)
#ELSE (QWTPOLAR_FOUND)
#  IF (QWTPOLAR_FIND_REQUIRED)
#    MESSAGE(FATAL_ERROR "Could not find QwtPolar")
#  ENDIF (QWTPOLAR_FIND_REQUIRED)
#ENDIF (QWTPOLAR_FOUND)




find_package(${QT_VERSION_BASE} COMPONENTS UiTools REQUIRED)

set (WITH_QWTPOLAR FALSE CACHE BOOL "Determines whether QwtPolar is available or whether functionality requiring QwtPolar should be disabled.")
# # Once we bump the minimum QWT VERSION to 6.2 or newer, we should get rid of WITH_QWTPOLAR
# if(QWT_VERSION_STR VERSION_GREATER_EQUAL 6.2 OR WITH_QWTPOLAR)
#   add_definitions(-DWITH_QWTPOLAR)

#   if(QWT_VERSION_STR VERSION_LESS 6.2)
#     find_package(QwtPolar REQUIRED)
#   else()
#     set(FOUND_QwtPolar TRUE)
#     set(QWTPOLAR_LIBRARY ${QWT_LIBRARY})
#     set(QWTPOLAR_INCLUDE_DIR ${QWT_INCLUDE_DIR})
#     add_definitions(-DQWT_POLAR_VERSION=0x060200)
#   endif()
#   # If not found on the system, offer the possibility to build QwtPolar
#   # internally
#   if(NOT FOUND_QwtPolar)
#     set(DEFAULT_WITH_INTERNAL_QWTPOLAR TRUE)
#   else()
#     set(DEFAULT_WITH_INTERNAL_QWTPOLAR FALSE)
#   endif()
#   set (WITH_INTERNAL_QWTPOLAR ${DEFAULT_WITH_INTERNAL_QWTPOLAR} CACHE BOOL "Use internal build of QwtPolar")

#   if(WITH_INTERNAL_QWTPOLAR)
#     set(QGIS_APP_SRCS
#       ${QGIS_APP_SRCS}
#       ${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1/qwt_polar_canvas.cpp
#       ${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1/qwt_polar_curve.cpp
#       ${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1/qwt_polar_fitter.cpp
#       ${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1/qwt_polar_grid.cpp
#       ${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1/qwt_polar_item.cpp
#       ${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1/qwt_polar_itemdict.cpp
#       ${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1/qwt_polar_layout.cpp
#       ${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1/qwt_polar_magnifier.cpp
#       ${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1/qwt_polar_marker.cpp
#       ${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1/qwt_polar_panner.cpp
#       ${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1/qwt_polar_picker.cpp
#       ${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1/qwt_polar_plot.cpp
#       ${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1/qwt_polar_renderer.cpp
#       ${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1/qwt_polar_spectrogram.cpp
#     )

#     set(QWTPOLAR_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1)

#     set(QWTPOLAR_LIBRARY "")
#   endif()
# else()
  set(QWTPOLAR_LIBRARY "")
  set(QWTPOLAR_INCLUDE_DIR "")
# endif()

if (POSTGRES_FOUND)
  if(HAVE_PGCONFIG)


target_include_directories(qgis_app SYSTEM PUBLIC
  ${QT_QTUITOOLS_INCLUDE_DIR}
#  ${QWTPOLAR_INCLUDE_DIR}
  ${CMAKE_SOURCE_DIR}/external/qt-unix-signals
)



target_link_libraries(qgis_app
  ${QWT_LIBRARY}
#  ${QWTPOLAR_LIBRARY}
  ${QT_VERSION_BASE}::Sql
  ${QT_VERSION_BASE}::UiTools
  ${OPTIONAL_QTWEBKIT}

Return to bug 935730

Lines 384-437 Link Here

(-)a/src/app/CMakeLists.txt (-48 / +48 lines)
384	find_package(${QT_VERSION_BASE} COMPONENTS UiTools REQUIRED)	384	find_package(${QT_VERSION_BASE} COMPONENTS UiTools REQUIRED)
385		385
386	set (WITH_QWTPOLAR FALSE CACHE BOOL "Determines whether QwtPolar is available or whether functionality requiring QwtPolar should be disabled.")	386	set (WITH_QWTPOLAR FALSE CACHE BOOL "Determines whether QwtPolar is available or whether functionality requiring QwtPolar should be disabled.")
387	# Once we bump the minimum QWT VERSION to 6.2 or newer, we should get rid of WITH_QWTPOLAR	387	# # Once we bump the minimum QWT VERSION to 6.2 or newer, we should get rid of WITH_QWTPOLAR
388	if(QWT_VERSION_STR VERSION_GREATER_EQUAL 6.2 OR WITH_QWTPOLAR)	388	# if(QWT_VERSION_STR VERSION_GREATER_EQUAL 6.2 OR WITH_QWTPOLAR)
389	add_definitions(-DWITH_QWTPOLAR)	389	# add_definitions(-DWITH_QWTPOLAR)
390		390
391	if(QWT_VERSION_STR VERSION_LESS 6.2)	391	# if(QWT_VERSION_STR VERSION_LESS 6.2)
392	find_package(QwtPolar REQUIRED)	392	# find_package(QwtPolar REQUIRED)
393	else()	393	# else()
394	set(FOUND_QwtPolar TRUE)	394	# set(FOUND_QwtPolar TRUE)
395	set(QWTPOLAR_LIBRARY ${QWT_LIBRARY})	395	# set(QWTPOLAR_LIBRARY ${QWT_LIBRARY})
396	set(QWTPOLAR_INCLUDE_DIR ${QWT_INCLUDE_DIR})	396	# set(QWTPOLAR_INCLUDE_DIR ${QWT_INCLUDE_DIR})
397	add_definitions(-DQWT_POLAR_VERSION=0x060200)	397	# add_definitions(-DQWT_POLAR_VERSION=0x060200)
398	endif()	398	# endif()
399	# If not found on the system, offer the possibility to build QwtPolar	399	# # If not found on the system, offer the possibility to build QwtPolar
400	# internally	400	# # internally
401	if(NOT FOUND_QwtPolar)	401	# if(NOT FOUND_QwtPolar)
402	set(DEFAULT_WITH_INTERNAL_QWTPOLAR TRUE)	402	# set(DEFAULT_WITH_INTERNAL_QWTPOLAR TRUE)
403	else()	403	# else()
404	set(DEFAULT_WITH_INTERNAL_QWTPOLAR FALSE)	404	# set(DEFAULT_WITH_INTERNAL_QWTPOLAR FALSE)
405	endif()	405	# endif()
406	set (WITH_INTERNAL_QWTPOLAR ${DEFAULT_WITH_INTERNAL_QWTPOLAR} CACHE BOOL "Use internal build of QwtPolar")	406	# set (WITH_INTERNAL_QWTPOLAR ${DEFAULT_WITH_INTERNAL_QWTPOLAR} CACHE BOOL "Use internal build of QwtPolar")
407		407
408	if(WITH_INTERNAL_QWTPOLAR)	408	# if(WITH_INTERNAL_QWTPOLAR)
409	set(QGIS_APP_SRCS	409	# set(QGIS_APP_SRCS
410	${QGIS_APP_SRCS}	410	# ${QGIS_APP_SRCS}
411	${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1/qwt_polar_canvas.cpp	411	# ${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1/qwt_polar_canvas.cpp
412	${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1/qwt_polar_curve.cpp	412	# ${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1/qwt_polar_curve.cpp
413	${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1/qwt_polar_fitter.cpp	413	# ${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1/qwt_polar_fitter.cpp
414	${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1/qwt_polar_grid.cpp	414	# ${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1/qwt_polar_grid.cpp
415	${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1/qwt_polar_item.cpp	415	# ${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1/qwt_polar_item.cpp
416	${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1/qwt_polar_itemdict.cpp	416	# ${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1/qwt_polar_itemdict.cpp
417	${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1/qwt_polar_layout.cpp	417	# ${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1/qwt_polar_layout.cpp
418	${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1/qwt_polar_magnifier.cpp	418	# ${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1/qwt_polar_magnifier.cpp
419	${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1/qwt_polar_marker.cpp	419	# ${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1/qwt_polar_marker.cpp
420	${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1/qwt_polar_panner.cpp	420	# ${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1/qwt_polar_panner.cpp
421	${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1/qwt_polar_picker.cpp	421	# ${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1/qwt_polar_picker.cpp
422	${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1/qwt_polar_plot.cpp	422	# ${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1/qwt_polar_plot.cpp
423	${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1/qwt_polar_renderer.cpp	423	# ${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1/qwt_polar_renderer.cpp
424	${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1/qwt_polar_spectrogram.cpp	424	# ${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1/qwt_polar_spectrogram.cpp
425	)	425	# )
426		426
427	set(QWTPOLAR_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1)	427	# set(QWTPOLAR_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1)
428		428
429	set(QWTPOLAR_LIBRARY "")	429	# set(QWTPOLAR_LIBRARY "")
430	endif()	430	# endif()
431	else()	431	# else()
432	set(QWTPOLAR_LIBRARY "")	432	set(QWTPOLAR_LIBRARY "")
433	set(QWTPOLAR_INCLUDE_DIR "")	433	set(QWTPOLAR_INCLUDE_DIR "")
434	endif()	434	# endif()
435		435
436	if (POSTGRES_FOUND)	436	if (POSTGRES_FOUND)
437	if(HAVE_PGCONFIG)	437	if(HAVE_PGCONFIG)
Lines 562-568 Link Here
562		562
563	target_include_directories(qgis_app SYSTEM PUBLIC	563	target_include_directories(qgis_app SYSTEM PUBLIC
564	${QT_QTUITOOLS_INCLUDE_DIR}	564	${QT_QTUITOOLS_INCLUDE_DIR}
565	${QWTPOLAR_INCLUDE_DIR}	565	# ${QWTPOLAR_INCLUDE_DIR}
566	${CMAKE_SOURCE_DIR}/external/qt-unix-signals	566	${CMAKE_SOURCE_DIR}/external/qt-unix-signals
567	)	567	)
568		568
Lines 570-576 Link Here
570		570
571	target_link_libraries(qgis_app	571	target_link_libraries(qgis_app
572	${QWT_LIBRARY}	572	${QWT_LIBRARY}
573	${QWTPOLAR_LIBRARY}	573	# ${QWTPOLAR_LIBRARY}
574	${QT_VERSION_BASE}::Sql	574	${QT_VERSION_BASE}::Sql
575	${QT_VERSION_BASE}::UiTools	575	${QT_VERSION_BASE}::UiTools
576	${OPTIONAL_QTWEBKIT}	576	${OPTIONAL_QTWEBKIT}

Lines 12-48 Link Here

(-)a/cmake/FindQwtPolar.cmake (-30 / +30 lines)
12	# QWTPOLAR_INCLUDE_DIR = where to find headers	12	# QWTPOLAR_INCLUDE_DIR = where to find headers
13	#	13	#
14		14
15	FIND_LIBRARY(QWTPOLAR_LIBRARY NAMES qwtpolar PATHS	15	#FIND_LIBRARY(QWTPOLAR_LIBRARY NAMES qwtpolar PATHS
16	/usr/lib	16	# /usr/lib
17	/usr/local/lib	17	# /usr/local/lib
18	"$ENV{LIB_DIR}/lib"	18	# "$ENV{LIB_DIR}/lib"
19	"$ENV{LIB}/lib"	19	# "$ENV{LIB}/lib"
20	)	20	# )
21		21
22	SET(_qwtpolar_fw)	22	#SET(_qwtpolar_fw)
23	IF (QWTPOLAR_LIBRARY MATCHES "/qwtpolar.*\\.framework")	23	#IF (QWTPOLAR_LIBRARY MATCHES "/qwtpolar.*\\.framework")
24	STRING(REGEX REPLACE "^(./qwtpolar.\\.framework).*$" "\\1" _qwtpolar_fw "${QWTPOLAR_LIBRARY}")	24	# STRING(REGEX REPLACE "^(./qwtpolar.\\.framework).*$" "\\1" _qwtpolar_fw "${QWTPOLAR_LIBRARY}")
25	ENDIF ()	25	#ENDIF ()
26		26
27	FIND_PATH(QWTPOLAR_INCLUDE_DIR NAMES qwt_polar.h PATHS	27	#FIND_PATH(QWTPOLAR_INCLUDE_DIR NAMES qwt_polar.h PATHS
28	"${_qwtpolar_fw}/Headers"	28	# "${_qwtpolar_fw}/Headers"
29	/usr/include	29	# /usr/include
30	/usr/local/include	30	# /usr/local/include
31	"$ENV{LIB_DIR}/include"	31	# "$ENV{LIB_DIR}/include"
32	"$ENV{INCLUDE}"	32	# "$ENV{INCLUDE}"
33	PATH_SUFFIXES qwtpolar qwt	33	# PATH_SUFFIXES qwtpolar qwt
34	)	34	# )
35		35
36	IF (QWTPOLAR_INCLUDE_DIR AND QWTPOLAR_LIBRARY)	36	#IF (QWTPOLAR_INCLUDE_DIR AND QWTPOLAR_LIBRARY)
37	SET(QWTPOLAR_FOUND TRUE)	37	# SET(QWTPOLAR_FOUND TRUE)
38	ENDIF (QWTPOLAR_INCLUDE_DIR AND QWTPOLAR_LIBRARY)	38	#ENDIF (QWTPOLAR_INCLUDE_DIR AND QWTPOLAR_LIBRARY)
39		39
40	IF (QWTPOLAR_FOUND)	40	#IF (QWTPOLAR_FOUND)
41	IF (NOT QWTPOLAR_FIND_QUIETLY)	41	# IF (NOT QWTPOLAR_FIND_QUIETLY)
42	MESSAGE(STATUS "Found QwtPolar: ${QWTPOLAR_LIBRARY}")	42	# MESSAGE(STATUS "Found QwtPolar: ${QWTPOLAR_LIBRARY}")
43	ENDIF (NOT QWTPOLAR_FIND_QUIETLY)	43	# ENDIF (NOT QWTPOLAR_FIND_QUIETLY)
44	ELSE (QWTPOLAR_FOUND)	44	#ELSE (QWTPOLAR_FOUND)
45	IF (QWTPOLAR_FIND_REQUIRED)	45	# IF (QWTPOLAR_FIND_REQUIRED)
46	MESSAGE(FATAL_ERROR "Could not find QwtPolar")	46	# MESSAGE(FATAL_ERROR "Could not find QwtPolar")
47	ENDIF (QWTPOLAR_FIND_REQUIRED)	47	# ENDIF (QWTPOLAR_FIND_REQUIRED)
48	ENDIF (QWTPOLAR_FOUND)	48	#ENDIF (QWTPOLAR_FOUND)