From d594946a7aadb96531de55a05def9ffad44625f8 Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Wed, 13 May 2015 00:15:08 +0000 Subject: [PATCH] Give the Hamlib includes directory highest precedence to avoid clashes 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 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b6621bb45..e4e02b066 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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}")