diff options
| -rw-r--r-- | cmake/Modules/FindCppUnit.cmake | 4 | ||||
| -rw-r--r-- | cmake/Modules/FindFFTW3f.cmake | 4 | ||||
| -rw-r--r-- | cmake/Modules/FindUHD.cmake | 4 | ||||
| -rw-r--r-- | gr-howto-write-a-block-cmake/cmake/Modules/FindGnuradioCore.cmake | 4 | ||||
| -rw-r--r-- | gr-howto-write-a-block-cmake/cmake/Modules/FindGruel.cmake | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/cmake/Modules/FindCppUnit.cmake b/cmake/Modules/FindCppUnit.cmake index a936bc546d..c3a5d96819 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 e8b581aedc..252af25227 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 0f0cc601bd..a9c64c7009 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 ) diff --git a/gr-howto-write-a-block-cmake/cmake/Modules/FindGnuradioCore.cmake b/gr-howto-write-a-block-cmake/cmake/Modules/FindGnuradioCore.cmake index ffa6582a26..34e85dbcfa 100644 --- a/gr-howto-write-a-block-cmake/cmake/Modules/FindGnuradioCore.cmake +++ b/gr-howto-write-a-block-cmake/cmake/Modules/FindGnuradioCore.cmake @@ -5,7 +5,7 @@ FIND_PATH( GNURADIO_CORE_INCLUDE_DIRS NAMES gr_random.h HINTS $ENV{GNURADIO_CORE_DIR}/include/gnuradio - ${PC_GNURADIO_CORE_INCLUDE_DIRS} + ${PC_GNURADIO_CORE_INCLUDE_DIR} PATHS /usr/local/include/gnuradio /usr/include/gnuradio ) @@ -14,7 +14,7 @@ FIND_LIBRARY( GNURADIO_CORE_LIBRARIES NAMES gnuradio-core HINTS $ENV{GNURADIO_CORE_DIR}/lib - ${PC_GNURADIO_CORE_LIBRARIES} + ${PC_GNURADIO_CORE_LIBDIR} PATHS /usr/local/lib /usr/local/lib64 /usr/lib diff --git a/gr-howto-write-a-block-cmake/cmake/Modules/FindGruel.cmake b/gr-howto-write-a-block-cmake/cmake/Modules/FindGruel.cmake index 3c21af91de..190c2e3390 100644 --- a/gr-howto-write-a-block-cmake/cmake/Modules/FindGruel.cmake +++ b/gr-howto-write-a-block-cmake/cmake/Modules/FindGruel.cmake @@ -5,7 +5,7 @@ FIND_PATH( GRUEL_INCLUDE_DIRS NAMES gruel/attributes.h HINTS $ENV{GRUEL_DIR}/include - ${PC_GRUEL_INCLUDE_DIRS} + ${PC_GRUEL_INCLUDE_DIR} PATHS /usr/local/include /usr/include ) @@ -14,7 +14,7 @@ FIND_LIBRARY( GRUEL_LIBRARIES NAMES gruel HINTS $ENV{GRUEL_DIR}/lib - ${PC_GRUEL_LIBRARIES} + ${PC_GRUEL_LIBDIR} PATHS /usr/local/lib /usr/local/lib64 /usr/lib |