Blame COPASI-find_QWT5-QTMML-SBW.patch
|
 |
0d9312f |
--- CMakeModules/FindQWT.orig.cmake 2015-06-17 07:55:18.000000000 +0200
|
|
|
0d9312f |
+++ CMakeModules/FindQWT.cmake 2015-06-22 11:34:42.750303512 +0200
|
|
|
c40a212 |
@@ -24,7 +24,7 @@
|
|
|
c40a212 |
/opt/local/include # MacPorts
|
|
|
c40a212 |
/opt/csw/include # Blastwave
|
|
|
c40a212 |
/opt/include
|
|
|
78c5aa2 |
- /usr/freeware/include
|
|
|
c40a212 |
+ /usr/include
|
|
|
85a2711 |
PATH_SUFFIXES qt5/qwt6 qwt qwt-qt4 qwt-qt5 qwt6
|
|
|
78c5aa2 |
NO_DEFAULT_PATH)
|
|
|
78c5aa2 |
|
|
|
c40a212 |
@@ -35,7 +35,7 @@
|
|
|
78c5aa2 |
|
|
|
78c5aa2 |
find_library(QWT_LIBRARY
|
|
|
85a2711 |
NAMES qwt-qt5
|
|
|
78c5aa2 |
- qwt-qt4
|
|
|
c40a212 |
+ qwt5-qt4
|
|
|
85a2711 |
qwt-static
|
|
|
c40a212 |
qwt
|
|
|
c40a212 |
PATHS $ENV{QWT_DIR}/lib
|
|
|
0d9312f |
--- CMakeModules/FindMML.orig.cmake 2015-06-17 07:55:18.000000000 +0200
|
|
|
0d9312f |
+++ CMakeModules/FindMML.cmake 2015-06-22 20:53:18.388194667 +0200
|
|
|
78c5aa2 |
@@ -20,6 +20,7 @@
|
|
|
78c5aa2 |
/opt/csw/include # Blastwave
|
|
|
78c5aa2 |
/opt/include
|
|
|
78c5aa2 |
/usr/freeware/include
|
|
|
f1f454d |
+ @@_libmml_includedir@@
|
|
|
78c5aa2 |
NO_DEFAULT_PATH)
|
|
|
78c5aa2 |
|
|
|
78c5aa2 |
if (NOT MML_INCLUDE_DIR)
|
|
|
78c5aa2 |
@@ -29,7 +30,8 @@
|
|
|
78c5aa2 |
find_library(MML_LIBRARY
|
|
|
78c5aa2 |
NAMES mml-static
|
|
|
78c5aa2 |
mml
|
|
|
78c5aa2 |
- QtSolutions_MMLWidget-2.4
|
|
|
78c5aa2 |
+ QtSolutions_MMLWidget-2.4
|
|
|
f1f454d |
+ mml-qt4
|
|
|
78c5aa2 |
PATHS $ENV{MML_DIR}/lib
|
|
|
78c5aa2 |
$ENV{MML_DIR}
|
|
|
78c5aa2 |
~/Library/Frameworks
|
|
|
78c5aa2 |
@@ -39,13 +41,15 @@
|
|
|
78c5aa2 |
/opt/csw/lib # Blastwave
|
|
|
78c5aa2 |
/opt/lib
|
|
|
78c5aa2 |
/usr/freeware/lib64
|
|
|
f1f454d |
+ @@_libmml_libdir@@
|
|
|
78c5aa2 |
NO_DEFAULT_PATH)
|
|
|
78c5aa2 |
|
|
|
78c5aa2 |
if (NOT MML_LIBRARY)
|
|
|
78c5aa2 |
find_library(MML_LIBRARY
|
|
|
78c5aa2 |
NAMES mml-static
|
|
|
78c5aa2 |
mml
|
|
|
78c5aa2 |
- QtSolutions_MMLWidget-2.4)
|
|
|
78c5aa2 |
+ QtSolutions_MMLWidget-2.4
|
|
|
f1f454d |
+ mml-qt4)
|
|
|
78c5aa2 |
endif()
|
|
|
78c5aa2 |
|
|
|
78c5aa2 |
if (NOT MML_INCLUDE_DIR)
|
|
|
78c5aa2 |
|
|
|
c40a212 |
|