Commit e3f5f74d authored by Jan Möbius's avatar Jan Möbius

Fixed apple cmake finder for qwt



git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@15674 383ad7c9-94d9-4d36-a494-682f7c89f535
parent ebfe71ec
......@@ -28,7 +28,6 @@ IF(NOT QT4_FOUND)
ENDIF(NOT QT4_FOUND)
IF( QT4_FOUND )
if ( CMAKE_GENERATOR MATCHES "Visual Studio 9*" )
set( SEARCHPATH "./" )
endif()
......@@ -42,10 +41,11 @@ IF( QT4_FOUND )
PATHS ${QT_INCLUDE_DIR}
/usr/local/qwt/include
/usr/local/include
/opt/local/include
/opt/local/include
/opt/local/include/qwt
/usr/include
/usr/include
c:\\libs\\${SEARCHPATH}\\x32\\Qwt-6.0.2
c:\\libs\\${SEARCHPATH}\\x32\\Qwt-6.0.2
c:\\libs\\Qwt-6.0.1
c:\\Program\ Files\\qwt\\qwt-5.2.0
c:\\qwt-5.2.0
......@@ -68,8 +68,13 @@ IF( QT4_FOUND )
get_filename_component(_Qwt5_Qt4_LIBRARY_DIR ${Qwt5_Qt4_TENTATIVE_LIBRARY_RELEASE} PATH)
set ( Qwt5_Qt4_LIBRARY_DIR ${_Qwt5_Qt4_LIBRARY_DIR} CACHE FILEPATH "Library dir of qwt" )
set ( Qwt5_Qt4_TENTATIVE_LIBRARY "optimized;${Qwt5_Qt4_TENTATIVE_LIBRARY_RELEASE};debug;${Qwt5_Qt4_TENTATIVE_LIBRARY_DEBUG}")
if ( Qwt5_Qt4_TENTATIVE_LIBRARY_RELEASE AND Qwt5_Qt4_TENTATIVE_LIBRARY_DEBUG )
set ( Qwt5_Qt4_TENTATIVE_LIBRARY "optimized;${Qwt5_Qt4_TENTATIVE_LIBRARY_RELEASE};debug;${Qwt5_Qt4_TENTATIVE_LIBRARY_DEBUG}")
else()
set ( Qwt5_Qt4_TENTATIVE_LIBRARY "${Qwt5_Qt4_TENTATIVE_LIBRARY_RELEASE}")
endif()
ELSEIF( WIN32 )
# Find Qwt5 library linked to Qt4 Release Version
FIND_LIBRARY( Qwt5_Qt4_TENTATIVE_LIBRARY_RELEASE NAMES qwt qwt5-qt4 qwt-qt4 qwt5 PATHS
......
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