Commit f3749c05 authored by Manuel Grizonnet's avatar Manuel Grizonnet

Merge branch '1620-monteverdi-and-mapla-segfault-at-startup' into 'release-6.6'

Resolve "monteverdi and mapla segfault at startup"

See merge request orfeotoolbox/otb!120
parents ae0a8d74 b3b21f8f
......@@ -62,17 +62,11 @@
# either expressed or implied, of the FreeBSD Project.
#=============================================================================
# message( "QWT_INCLUDE_DIR: '${QWT_INCLUDE_DIR}'" )
# message( "QWT_INCLUDE_DIR: '${QT_INCLUDE_DIR}'" )
find_path( QWT_INCLUDE_DIR
NAMES qwt_plot.h
PATH_SUFFIXES qwt
PATH_SUFFIXES qwt-qt5 qwt qwt6
)
# message( "QWT_INCLUDE_DIR: '${QWT_INCLUDE_DIR}'" )
# message( "QWT_INCLUDE_DIR: '${QT_INCLUDE_DIR}'" )
set ( QWT_INCLUDE_DIRS ${QWT_INCLUDE_DIR} )
# version
......@@ -104,8 +98,7 @@ endif ()
find_library ( QWT_LIBRARY
NAMES qwt qwt${QWT_MAJOR_VERSION} qwt-qt5
HINTS ${QT_LIBRARY_DIR}
NAMES qwt-qt5 qwt6-qt5 qwt qwt6
)
set ( QWT_LIBRARIES ${QWT_LIBRARY} )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment