diff options
| author | gnieboer <gnieboer@corpcomm.net> | 2016-02-07 00:03:00 +0300 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-05-30 13:21:13 -0700 |
| commit | ae26f969c9c260556aad4ffd006fea96f3452d01 (patch) | |
| tree | df147aeb0b90dc60b1680d13942ea096c3bc1f63 /cmake | |
| parent | 97059450f485bb1bf74f5dc2b2bf8b1852a0a7bf (diff) | |
MSVC-specific changes for compatibility
* Changed gr-dtv cmake so SSE2 would be detected on both
MSVC and GCC compilers
* Removed addition of /O2 flag on MSVC builds as it conflicts
with /RTC1 flag
* Added detection of MSVC 14.0 and added additional filenames to
library detection to cover what windows builds the dependencies as.
* Additional name options were placed at end so as to not conflict
with other builds.
* Removed use of not() function and replaced with standard C syntax.
The check for zero is to handle the edge case where the random
numbers return zero and would cause a div/zero error two lines
afterwards.
* Add dwrite library for win32 builds for qtgui
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Modules/FindGSL.cmake | 2 | ||||
| -rw-r--r-- | cmake/Modules/FindQwt.cmake | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/cmake/Modules/FindGSL.cmake b/cmake/Modules/FindGSL.cmake index b36a1e9c2a..7b8c6cdb64 100644 --- a/cmake/Modules/FindGSL.cmake +++ b/cmake/Modules/FindGSL.cmake @@ -44,7 +44,7 @@ if( WIN32 AND NOT CYGWIN AND NOT MSYS ) # look for gsl cblas library find_library( GSL_CBLAS_LIBRARY - NAMES gslcblas + NAMES gslcblas cblas ) if( GSL_CBLAS_LIBRARY ) set( GSL_CBLAS_FOUND ON ) diff --git a/cmake/Modules/FindQwt.cmake b/cmake/Modules/FindQwt.cmake index 3ce49aa04b..da8bbe9049 100644 --- a/cmake/Modules/FindQwt.cmake +++ b/cmake/Modules/FindQwt.cmake @@ -9,6 +9,7 @@ find_path(QWT_INCLUDE_DIRS NAMES qwt_global.h HINTS ${CMAKE_INSTALL_PREFIX}/include/qwt + ${CMAKE_PREFIX_PATH}/include/qwt PATHS /usr/local/include/qwt-qt4 /usr/local/include/qwt @@ -22,10 +23,11 @@ find_path(QWT_INCLUDE_DIRS ) find_library (QWT_LIBRARIES - NAMES qwt6 qwt6-qt4 qwt qwt-qt4 + NAMES qwt6 qwt6-qt4 qwt qwt-qt4 qwt5 qwtd5 HINTS ${CMAKE_INSTALL_PREFIX}/lib ${CMAKE_INSTALL_PREFIX}/lib64 + ${CMAKE_PREFIX_PATH}/lib PATHS /usr/local/lib /usr/lib |