mirror of
https://git.freebsd.org/ports.git
synced 2025-07-08 04:49:17 -04:00
2f161225a6
## unreleased ### Fixed #### Project Scope - `boost::posix_time::[milli]second` takes integer numbers, and we now at least cast the floats to integers, as Boost 1.67 forced us to realize we're (incorrectly) using floating point her - CMake: using regex to match compiler against "Clang" now enables correct build on OS X #### GRC - Fixed GRC bug which broke WX and Qt (by altering the template code), in multiple (less than awesome) steps #### gr-analog - `fmdet_cf`'s derivative coefficients were wrong. #### gr-blocks - `float_array_to_int`: int32 limits were wrongly hardcoded. - Fixed the undefined behaviour happening in `float_to_complex` when accessing the second input_items element in the single-input case ### Added #### gr-analog - QA for complex cosine #### gr-utils - `gr_modtool` now with autocompletion candidates for `rm` ### Changed #### Project Scope - Removed cppunit from all unit tests, replaced by Boost - Removed the cppunit dependency
26 lines
837 B
CMake
26 lines
837 B
CMake
--- cmake/Modules/FindQwt.cmake.orig 2019-03-09 13:28:14 UTC
|
|
+++ cmake/Modules/FindQwt.cmake
|
|
@@ -15,10 +15,11 @@ find_path(QWT_INCLUDE_DIRS
|
|
${CMAKE_INSTALL_PREFIX}/include/qwt
|
|
${CMAKE_PREFIX_PATH}/include/qwt
|
|
PATHS
|
|
+ /usr/local/include/qt5/qwt6
|
|
/usr/local/include/qwt-${QWT_QT_VERSION}
|
|
+ /usr/include/qt5/qwt
|
|
/usr/local/include/qwt
|
|
/usr/include/qwt6
|
|
- /usr/include/qt5/qwt
|
|
/usr/include/qwt-${QWT_QT_VERSION}
|
|
/usr/include/qwt
|
|
/usr/include/${QWT_QT_VERSION}/qwt
|
|
@@ -29,8 +30,9 @@ find_path(QWT_INCLUDE_DIRS
|
|
)
|
|
|
|
find_library (QWT_LIBRARIES
|
|
- NAMES ${PC_QWT_LIBRARIES} qwt6-${QWT_QT_VERSION} qwt-${QWT_QT_VERSION}
|
|
+ NAMES ${PC_QWT_LIBRARIES} qwt6 qwt6-${QWT_QT_VERSION} qwt-${QWT_QT_VERSION}
|
|
HINTS
|
|
+ /usr/local/lib/qt5
|
|
${PC_QWT_LIBDIR}
|
|
${CMAKE_INSTALL_PREFIX}/lib
|
|
${CMAKE_INSTALL_PREFIX}/lib64
|