diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-05-30 13:54:20 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-05-30 13:54:20 -0700 |
| commit | 0d32337545f554dffe0dee69f5f1415ac2f5b673 (patch) | |
| tree | 484d30b4cfd6b5117ec621072c00553162e434a8 /cmake | |
| parent | 2b388eac959cc9b516f5ef6dea4f79d51a540dfd (diff) | |
| parent | 23460e36094ad85c559a538918c3b40e76b2fa37 (diff) | |
Merge branch 'maint'
Conflicts:
CMakeLists.txt
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Modules/FindGSL.cmake | 2 | ||||
| -rw-r--r-- | cmake/Modules/FindQwt.cmake | 4 | ||||
| -rw-r--r-- | cmake/Modules/GrBoost.cmake | 7 | ||||
| -rw-r--r-- | cmake/msvc/config.h | 7 |
4 files changed, 17 insertions, 3 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 diff --git a/cmake/Modules/GrBoost.cmake b/cmake/Modules/GrBoost.cmake index ecf58a9367..6e036a5bdc 100644 --- a/cmake/Modules/GrBoost.cmake +++ b/cmake/Modules/GrBoost.cmake @@ -31,10 +31,15 @@ set(BOOST_REQUIRED_COMPONENTS program_options filesystem system - thread regex ) +if (MINGW) + set(BOOST_REQUIRED_COMPONENTS ${BOOST_REQUIRED_COMPONENTS} thread_win32) +else(MINGW) + set(BOOST_REQUIRED_COMPONENTS ${BOOST_REQUIRED_COMPONENTS} thread) +endif(MINGW) + if(UNIX AND NOT BOOST_ROOT AND EXISTS "/usr/lib64") list(APPEND BOOST_LIBRARYDIR "/usr/lib64") #fedora 64-bit fix endif(UNIX AND NOT BOOST_ROOT AND EXISTS "/usr/lib64") diff --git a/cmake/msvc/config.h b/cmake/msvc/config.h index 43792c7837..50515104db 100644 --- a/cmake/msvc/config.h +++ b/cmake/msvc/config.h @@ -21,19 +21,25 @@ typedef ptrdiff_t ssize_t; //////////////////////////////////////////////////////////////////////// // rint functions //////////////////////////////////////////////////////////////////////// +#define _USE_MATH_DEFINES #include <math.h> +#if _MSC_VER < 1800 static inline long lrint(double x){return (long)(x > 0.0 ? x + 0.5 : x - 0.5);} static inline long lrintf(float x){return (long)(x > 0.0f ? x + 0.5f : x - 0.5f);} static inline long long llrint(double x){return (long long)(x > 0.0 ? x + 0.5 : x - 0.5);} static inline long long llrintf(float x){return (long long)(x > 0.0f ? x + 0.5f : x - 0.5f);} static inline double rint(double x){return (x > 0.0)? floor(x + 0.5) : ceil(x - 0.5);} static inline float rintf(float x){return (x > 0.0f)? floorf(x + 0.5f) : ceilf(x - 0.5f);} +#endif //////////////////////////////////////////////////////////////////////// // math constants //////////////////////////////////////////////////////////////////////// +#ifndef INFINITY #define INFINITY HUGE_VAL +#endif +#ifndef _MATH_DEFINES_DEFINED # define M_E 2.7182818284590452354 /* e */ # define M_LOG2E 1.4426950408889634074 /* log_2 e */ # define M_LOG10E 0.43429448190325182765 /* log_10 e */ @@ -47,6 +53,7 @@ static inline float rintf(float x){return (x > 0.0f)? floorf(x + 0.5f) : ceilf(x # define M_2_SQRTPI 1.12837916709551257390 /* 2/sqrt(pi) */ # define M_SQRT2 1.41421356237309504880 /* sqrt(2) */ # define M_SQRT1_2 0.70710678118654752440 /* 1/sqrt(2) */ +#endif //////////////////////////////////////////////////////////////////////// // random and srandom |