diff options
| author | Josh Blum | 2011-10-25 16:19:53 -0700 |
|---|---|---|
| committer | Tom Rondeau | 2011-10-25 19:38:43 -0400 |
| commit | fde3f39419a301d87bb460f9b857e3454d019aa9 (patch) | |
| tree | 79e6117909cd1d1f649ad0a4e9087ec0ae0da5a1 /cmake/Modules | |
| parent | a23f6624c6da8c850ed144916947a3dbff0db885 (diff) | |
| download | gnuradio-fde3f39419a301d87bb460f9b857e3454d019aa9.tar.gz gnuradio-fde3f39419a301d87bb460f9b857e3454d019aa9.tar.bz2 gnuradio-fde3f39419a301d87bb460f9b857e3454d019aa9.zip | |
cmake: fix for find* scripts
Yes there was a misunderstanding and I read the docs wrong.
This change uses the correct lib and inc dirs set by the pkg config macro.
http://techbase.kde.org/Policies/CMake_Coding_Style#Writing_CMake_Find-modules
Diffstat (limited to 'cmake/Modules')
| -rw-r--r-- | cmake/Modules/FindCppUnit.cmake | 4 | ||||
| -rw-r--r-- | cmake/Modules/FindFFTW3f.cmake | 4 | ||||
| -rw-r--r-- | cmake/Modules/FindUHD.cmake | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/cmake/Modules/FindCppUnit.cmake b/cmake/Modules/FindCppUnit.cmake index a936bc546..c3a5d9681 100644 --- a/cmake/Modules/FindCppUnit.cmake +++ b/cmake/Modules/FindCppUnit.cmake @@ -14,7 +14,7 @@ PKG_CHECK_MODULES(PC_CPPUNIT "cppunit" QUIET) FIND_PATH(CPPUNIT_INCLUDE_DIRS NAMES cppunit/TestCase.h - HINTS ${PC_CPPUNIT_INCLUDE_DIRS} + HINTS ${PC_CPPUNIT_INCLUDE_DIR} PATHS /usr/local/include /usr/include @@ -22,7 +22,7 @@ FIND_PATH(CPPUNIT_INCLUDE_DIRS FIND_LIBRARY(CPPUNIT_LIBRARIES NAMES cppunit - HINTS ${PC_CPPUNIT_LIBRARIES} + HINTS ${PC_CPPUNIT_LIBDIR} PATHS ${CPPUNIT_INCLUDE_DIRS}/../lib /usr/local/lib diff --git a/cmake/Modules/FindFFTW3f.cmake b/cmake/Modules/FindFFTW3f.cmake index e8b581aed..252af2522 100644 --- a/cmake/Modules/FindFFTW3f.cmake +++ b/cmake/Modules/FindFFTW3f.cmake @@ -10,7 +10,7 @@ FIND_PATH( FFTW3F_INCLUDE_DIRS NAMES fftw3.h HINTS $ENV{FFTW3_DIR}/include - ${PC_FFTW3F_INCLUDE_DIRS} + ${PC_FFTW3F_INCLUDE_DIR} PATHS /usr/local/include /usr/include ) @@ -19,7 +19,7 @@ FIND_LIBRARY( FFTW3F_LIBRARIES NAMES fftw3f libfftw3f HINTS $ENV{FFTW3_DIR}/lib - ${PC_FFTW3F_LIBRARIES} + ${PC_FFTW3F_LIBDIR} PATHS /usr/local/lib /usr/lib ) diff --git a/cmake/Modules/FindUHD.cmake b/cmake/Modules/FindUHD.cmake index 0f0cc601b..a9c64c700 100644 --- a/cmake/Modules/FindUHD.cmake +++ b/cmake/Modules/FindUHD.cmake @@ -9,7 +9,7 @@ FIND_PATH( UHD_INCLUDE_DIRS NAMES uhd/config.hpp HINTS $ENV{UHD_DIR}/include - ${PC_UHD_INCLUDE_DIRS} + ${PC_UHD_INCLUDEDIR} PATHS /usr/local/include /usr/include ) @@ -18,7 +18,7 @@ FIND_LIBRARY( UHD_LIBRARIES NAMES uhd HINTS $ENV{UHD_DIR}/lib - ${PC_UHD_LIBRARIES} + ${PC_UHD_LIBDIR} PATHS /usr/local/lib /usr/lib ) |