w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-03-23 12:38:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Give the Hamlib includes directory highest precedence to avoid clashes

Browse Source 
Since the FFTW3 includes have been fixed for C/C++, Hamlib library headers
other than the found ones were being incorrectly picked up. This has been
resolved by ensuring that the Hamlib include directory is passed to the
compilers first.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5371 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Bill Somerville 2015-05-13 00:15:08 +00:00
parent 9711b268f0
commit d594946a7a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -674,7 +674,7 @@ include_directories (${FFTW3_INCLUDE_DIRS})
# libhamlib setup
#
find_package (hamlib 3 REQUIRED)
include_directories (${hamlib_INCLUDE_DIRS})
include_directories (BEFORE ${hamlib_INCLUDE_DIRS})
if (hamlib_STATIC_LIBRARY)
# static link hamlib if archive library available
set (hamlib_LIBRARY "${hamlib_STATIC_LIBRARY}")