Blame COPASI-find_QWT6-QTMML-SBW.patch
|
 |
78c5aa2 |
--- CMakeModules/FindQwtQt4.orig.cmake 2015-06-17 07:55:18.000000000 +0200
|
|
|
78c5aa2 |
+++ CMakeModules/FindQwtQt4.cmake 2015-06-22 11:34:42.750303512 +0200
|
|
|
78c5aa2 |
@@ -11,36 +11,18 @@
|
|
|
78c5aa2 |
# QWT_LIBRARY - Link these to use qwt
|
|
|
78c5aa2 |
|
|
|
78c5aa2 |
find_path(QWT_INCLUDE_DIR qwt.h
|
|
|
78c5aa2 |
- PATHS $ENV{QWT_DIR}/include
|
|
|
78c5aa2 |
- $ENV{QWT_DIR}
|
|
|
78c5aa2 |
- ~/Library/Frameworks
|
|
|
78c5aa2 |
- /Library/Frameworks
|
|
|
78c5aa2 |
- /sw/include # Fink
|
|
|
78c5aa2 |
- /opt/local/include # MacPorts
|
|
|
78c5aa2 |
- /opt/csw/include # Blastwave
|
|
|
78c5aa2 |
- /opt/include
|
|
|
78c5aa2 |
- /usr/freeware/include
|
|
|
78c5aa2 |
- PATH_SUFFIXES qwt qwt-qt4
|
|
|
78c5aa2 |
+ PATHS /usr/include
|
|
|
78c5aa2 |
+ PATH_SUFFIXES qwt
|
|
|
78c5aa2 |
NO_DEFAULT_PATH)
|
|
|
78c5aa2 |
|
|
|
78c5aa2 |
if (NOT QWT_INCLUDE_DIR)
|
|
|
78c5aa2 |
find_path(QWT_INCLUDE_DIR qwt.h
|
|
|
78c5aa2 |
- PATH_SUFFIXES qwt qwt-qt4)
|
|
|
78c5aa2 |
+ PATH_SUFFIXES qwt)
|
|
|
78c5aa2 |
endif ()
|
|
|
78c5aa2 |
|
|
|
78c5aa2 |
find_library(QWT_LIBRARY
|
|
|
78c5aa2 |
- NAMES qwt-static
|
|
|
78c5aa2 |
- qwt-qt4
|
|
|
78c5aa2 |
- qwt
|
|
|
78c5aa2 |
- PATHS $ENV{QWT_DIR}/lib
|
|
|
78c5aa2 |
- $ENV{QWT_DIR}
|
|
|
78c5aa2 |
- ~/Library/Frameworks
|
|
|
78c5aa2 |
- /Library/Frameworks
|
|
|
78c5aa2 |
- /sw/lib # Fink
|
|
|
78c5aa2 |
- /opt/local/lib # MacPorts
|
|
|
78c5aa2 |
- /opt/csw/lib # Blastwave
|
|
|
78c5aa2 |
- /opt/lib
|
|
|
78c5aa2 |
- /usr/freeware/lib64
|
|
|
78c5aa2 |
+ NAMES qwt
|
|
|
78c5aa2 |
+ PATHS @@libdir@@
|
|
|
78c5aa2 |
NO_DEFAULT_PATH)
|
|
|
78c5aa2 |
|
|
|
78c5aa2 |
if (NOT QWT_LIBRARY)
|
|
|
78c5aa2 |
--- CMakeModules/FindQtMmlQt4.orig.cmake 2015-06-17 07:55:18.000000000 +0200
|
|
|
78c5aa2 |
+++ CMakeModules/FindQtMmlQt4.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
|
|
|
78c5aa2 |
+ @@_kde4_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
|
|
|
78c5aa2 |
+ qtmmlwidget
|
|
|
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
|
|
|
78c5aa2 |
+ @@_kde4_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
|
|
|
78c5aa2 |
+ qtmmlwidget)
|
|
|
78c5aa2 |
endif()
|
|
|
78c5aa2 |
|
|
|
78c5aa2 |
if (NOT MML_INCLUDE_DIR)
|
|
|
78c5aa2 |
--- CMakeModules/FindSBW.orig.cmake 2015-06-17 07:55:18.000000000 +0200
|
|
|
78c5aa2 |
+++ CMakeModules/FindSBW.cmake 2015-06-22 21:46:45.681316360 +0200
|
|
|
78c5aa2 |
@@ -27,11 +27,11 @@
|
|
|
78c5aa2 |
endif ()
|
|
|
78c5aa2 |
|
|
|
78c5aa2 |
find_library(SBW_LIBRARIES
|
|
|
78c5aa2 |
- NAMES SBW-static
|
|
|
78c5aa2 |
- SBW
|
|
|
78c5aa2 |
- sbw
|
|
|
78c5aa2 |
- libSBW
|
|
|
78c5aa2 |
+ NAMES SBW
|
|
|
78c5aa2 |
libsbw
|
|
|
78c5aa2 |
+ SBW-static
|
|
|
78c5aa2 |
+ SBW
|
|
|
78c5aa2 |
+ sbw
|
|
|
78c5aa2 |
PATHS $ENV{SBW_DIR}/lib
|
|
|
78c5aa2 |
$ENV{SBW_DIR}
|
|
|
78c5aa2 |
~/Library/Frameworks
|
|
|
78c5aa2 |
|