diff options
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Modules/FindFFTW3f.cmake | 14 | ||||
| -rw-r--r-- | cmake/Modules/FindQwt.cmake | 8 | ||||
| -rw-r--r-- | cmake/Modules/GrPackage.cmake | 3 | ||||
| -rw-r--r-- | cmake/Modules/GrPython.cmake | 4 | ||||
| -rw-r--r-- | cmake/Toolchains/arm_cortex_a8_native.cmake | 4 |
5 files changed, 28 insertions, 5 deletions
diff --git a/cmake/Modules/FindFFTW3f.cmake b/cmake/Modules/FindFFTW3f.cmake index 078108958..0ee7e46fe 100644 --- a/cmake/Modules/FindFFTW3f.cmake +++ b/cmake/Modules/FindFFTW3f.cmake @@ -22,8 +22,20 @@ FIND_LIBRARY( ${PC_FFTW3F_LIBDIR} PATHS /usr/local/lib /usr/lib + /usr/lib64 ) +FIND_LIBRARY( + FFTW3F_THREADS_LIBRARIES + NAMES fftw3f_threads libfftw3f_threads + HINTS $ENV{FFTW3_DIR}/lib + ${PC_FFTW3F_LIBDIR} + PATHS /usr/local/lib + /usr/lib + /usr/lib64 +) + + INCLUDE(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(FFTW3F DEFAULT_MSG FFTW3F_LIBRARIES FFTW3F_INCLUDE_DIRS) -MARK_AS_ADVANCED(FFTW3F_LIBRARIES FFTW3F_INCLUDE_DIRS) +MARK_AS_ADVANCED(FFTW3F_LIBRARIES FFTW3F_INCLUDE_DIRS FFTW3F_THREADS_LIBRARIES)
\ No newline at end of file diff --git a/cmake/Modules/FindQwt.cmake b/cmake/Modules/FindQwt.cmake index 857020796..cbda16aa0 100644 --- a/cmake/Modules/FindQwt.cmake +++ b/cmake/Modules/FindQwt.cmake @@ -10,11 +10,17 @@ find_path (QWT_INCLUDE_DIRS /usr/local/include/qwt /usr/include/qwt-qt4 /usr/include/qwt + /opt/local/include/qwt + /sw/include/qwt ) find_library (QWT_LIBRARIES NAMES qwt-qt4 qwt - PATHS /usr/local/lib /usr/lib + PATHS + /usr/local/lib + /usr/lib + /opt/local/lib + /sw/lib ) # handle the QUIETLY and REQUIRED arguments and set QWT_FOUND to TRUE if diff --git a/cmake/Modules/GrPackage.cmake b/cmake/Modules/GrPackage.cmake index a65a2f8a7..3aca79632 100644 --- a/cmake/Modules/GrPackage.cmake +++ b/cmake/Modules/GrPackage.cmake @@ -123,7 +123,7 @@ if((DEBIAN OR REDHAT) AND LSB_RELEASE_EXECUTABLE) ) #set a more sensible package name for this system - SET(CPACK_PACKAGE_FILE_NAME "gnuradio-${CPACK_PACKAGE_VERSION}-${LSB_ID}-${LSB_RELEASE}-${CMAKE_SYSTEM_PROCESSOR}") + SET(CPACK_PACKAGE_FILE_NAME "gnuradio_${CPACK_PACKAGE_VERSION}_${LSB_ID}-${LSB_RELEASE}-${CMAKE_SYSTEM_PROCESSOR}") #now try to include the component based dependencies set(package_deps_file "${CMAKE_SOURCE_DIR}/cmake/Packaging/${LSB_ID}-${LSB_RELEASE}.cmake") @@ -134,6 +134,7 @@ if((DEBIAN OR REDHAT) AND LSB_RELEASE_EXECUTABLE) endif() if(${CPACK_GENERATOR} STREQUAL NSIS) + set(CPACK_PACKAGE_FILE_NAME "gnuradio_${CPACK_PACKAGE_VERSION}_win32") set(CPACK_PACKAGE_INSTALL_DIRECTORY "${CMAKE_PROJECT_NAME}") endif() diff --git a/cmake/Modules/GrPython.cmake b/cmake/Modules/GrPython.cmake index e8e07b244..eff9cbcdc 100644 --- a/cmake/Modules/GrPython.cmake +++ b/cmake/Modules/GrPython.cmake @@ -183,6 +183,10 @@ function(GR_PYTHON_INSTALL) #################################################################### file(TO_NATIVE_PATH ${PYTHON_EXECUTABLE} pyexe_native) + if (CMAKE_CROSSCOMPILING) + set(pyexe_native /usr/bin/env python) + endif() + foreach(pyfile ${GR_PYTHON_INSTALL_PROGRAMS}) get_filename_component(pyfile_name ${pyfile} NAME) get_filename_component(pyfile ${pyfile} ABSOLUTE) diff --git a/cmake/Toolchains/arm_cortex_a8_native.cmake b/cmake/Toolchains/arm_cortex_a8_native.cmake index 7dbb80049..8e60eaab1 100644 --- a/cmake/Toolchains/arm_cortex_a8_native.cmake +++ b/cmake/Toolchains/arm_cortex_a8_native.cmake @@ -4,5 +4,5 @@ ######################################################################## set(CMAKE_CXX_COMPILER g++) set(CMAKE_C_COMPILER gcc) -set(CMAKE_CXX_FLAGS "-march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp") -set(CMAKE_C_FLAGS ${CMAKE_CXX_FLAGS}) #same flags for C sources +set(CMAKE_CXX_FLAGS "-march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp" CACHE STRING "" FORCE) +set(CMAKE_C_FLAGS ${CMAKE_CXX_FLAGS} CACHE STRING "" FORCE) #same flags for C sources |