FGFS-4.1/gr-air-modes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #100 from gnieboer/WinFixes

Browse Source 
Win fixes
This commit is contained in:
Nick Foster 2017-03-14 12:32:35 -07:00 committed by GitHub
commit 48c1afc3ba
2 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
cmake/Modules/FindQwt.cmake
View File

@ -4,23 +4,34 @@
# QWT_FOUND If false, do not try to use Qwt # QWT_FOUND If false, do not try to use Qwt
find_path (QWT_INCLUDE_DIRS find_path (QWT_INCLUDE_DIRS
NAMES qwt_plot.h NAMES qwt_plot.h
PATHS HINTS
/usr/local/include/qwt-qt4 ${CMAKE_INSTALL_PREFIX}/include/qwt
/usr/local/include/qwt ${CMAKE_PREFIX_PATH}/include/qwt
/usr/include/qwt-qt4 PATHS
/usr/include/qwt /usr/local/include/qwt-qt4
/opt/local/include/qwt /usr/local/include/qwt
/sw/include/qwt /usr/include/qwt6
/usr/include/qwt-qt4
/usr/include/qwt
/usr/include/qwt5
/opt/local/include/qwt
/sw/include/qwt
/usr/local/lib/qwt.framework/Headers
) )
find_library (QWT_LIBRARIES find_library (QWT_LIBRARIES
NAMES qwt-qt4 qwt NAMES qwt6 qwt6-qt4 qwt qwt-qt4 qwt5 qwtd5
PATHS HINTS
/usr/local/lib ${CMAKE_INSTALL_PREFIX}/lib
/usr/lib ${CMAKE_INSTALL_PREFIX}/lib64
/opt/local/lib ${CMAKE_PREFIX_PATH}/lib
/sw/lib PATHS
/usr/local/lib
/usr/lib
/opt/local/lib
/sw/lib
/usr/local/lib/qwt.framework
) )
# handle the QUIETLY and REQUIRED arguments and set QWT_FOUND to TRUE if # handle the QUIETLY and REQUIRED arguments and set QWT_FOUND to TRUE if

4
cmake/Modules/GrBoost.cmake
View File

@ -87,7 +87,7 @@ set(Boost_NOGO_VERSIONS
) )
foreach(ver ${Boost_NOGO_VERSIONS}) foreach(ver ${Boost_NOGO_VERSIONS})
if(${Boost_VERSION} EQUAL ${ver}) if("${Boost_VERSION}" STREQUAL "${ver}")
if(NOT ENABLE_BAD_BOOST) if(NOT ENABLE_BAD_BOOST)
MESSAGE(STATUS "WARNING: Found a known bad version of Boost (v${Boost_VERSION}). Disabling.") MESSAGE(STATUS "WARNING: Found a known bad version of Boost (v${Boost_VERSION}). Disabling.")
set(Boost_FOUND FALSE) set(Boost_FOUND FALSE)
@ -95,5 +95,5 @@ foreach(ver ${Boost_NOGO_VERSIONS})
MESSAGE(STATUS "WARNING: Found a known bad version of Boost (v${Boost_VERSION}). Continuing anyway.") MESSAGE(STATUS "WARNING: Found a known bad version of Boost (v${Boost_VERSION}). Continuing anyway.")
set(Boost_FOUND TRUE) set(Boost_FOUND TRUE)
endif(NOT ENABLE_BAD_BOOST) endif(NOT ENABLE_BAD_BOOST)
endif(${Boost_VERSION} EQUAL ${ver}) endif("${Boost_VERSION}" STREQUAL "${ver}")
endforeach(ver) endforeach(ver)