Changeset 19976 for trunk/FACT++/cmake

Timestamp:

07/27/20 17:29:02 (5 years ago)

Author:

tbretz

Message:

Implemented basic support for compiling with Qt5 (this is not yet working reliably) and improved the finding of Qwt

File:

• trunk/FACT++/cmake/FindQwt.cmake (modified) (1 diff)

trunk/FACT++/cmake/FindQwt.cmake

@@ -4 +4 @@
 # Try to locate the package in the default path
 # and in the path provided by pkg-config
-FIND_PATH(QWT_INCLUDE_DIR NAMES qwt-qt4/qwt.h PATHS ${QWT_INCLUDE_DIRS})
-FIND_LIBRARY(QWT_LIBRARY NAMES qwt-qt4 PATHS ${QWT_LIBRARY_DIRS})
+#FIND_PATH(QWT_INCLUDE_DIR NAMES qwt-qt4/qwt.h qwt/qwt.h PATHS ${QWT_INCLUDE_DIRS})
+FIND_PATH(QWT_INCLUDE_DIR NAMES qwt.h PATHS ${QWT_INCLUDE_DIRS} PATH_SUFFIXES qwt qwt-qt4)
+FIND_LIBRARY(QWT_LIBRARY NAMES qwt qwt-qt4 PATHS ${QWT_LIBRARY_DIRS})
 
 # Check if QWT_LIBARARY and QWT_INCLUDE_DIR is set