diff options
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Modules/FindCppUnit.cmake | 2 | ||||
| -rw-r--r-- | cmake/Modules/FindFFTW3f.cmake | 16 | ||||
| -rw-r--r-- | cmake/Modules/FindQwt.cmake | 8 | ||||
| -rw-r--r-- | cmake/Modules/FindUHD.cmake | 2 | ||||
| -rw-r--r-- | cmake/Modules/GrPackage.cmake | 5 | ||||
| -rw-r--r-- | cmake/Modules/GrPlatform.cmake | 10 | ||||
| -rw-r--r-- | cmake/Modules/GrPython.cmake | 4 | ||||
| -rw-r--r-- | cmake/Packaging/Fedora-15.cmake | 4 | ||||
| -rw-r--r-- | cmake/Toolchains/arm_cortex_a8_native.cmake | 4 |
9 files changed, 43 insertions, 12 deletions
diff --git a/cmake/Modules/FindCppUnit.cmake b/cmake/Modules/FindCppUnit.cmake index 29c9ba4ff..9af308f84 100644 --- a/cmake/Modules/FindCppUnit.cmake +++ b/cmake/Modules/FindCppUnit.cmake @@ -10,7 +10,7 @@ # CPPUNIT_FOUND, If false, do not try to use CppUnit. INCLUDE(FindPkgConfig) -PKG_CHECK_MODULES(PC_CPPUNIT QUIET "cppunit") +PKG_CHECK_MODULES(PC_CPPUNIT "cppunit") FIND_PATH(CPPUNIT_INCLUDE_DIRS NAMES cppunit/TestCase.h diff --git a/cmake/Modules/FindFFTW3f.cmake b/cmake/Modules/FindFFTW3f.cmake index beb5c189e..0ee7e46fe 100644 --- a/cmake/Modules/FindFFTW3f.cmake +++ b/cmake/Modules/FindFFTW3f.cmake @@ -4,7 +4,7 @@ # Find single-precision (float) version of FFTW3 INCLUDE(FindPkgConfig) -PKG_CHECK_MODULES(PC_FFTW3F QUIET "fftw3f >= 3.0") +PKG_CHECK_MODULES(PC_FFTW3F "fftw3f >= 3.0") FIND_PATH( FFTW3F_INCLUDE_DIRS @@ -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/FindUHD.cmake b/cmake/Modules/FindUHD.cmake index 6a7956b2c..b4d12b6d7 100644 --- a/cmake/Modules/FindUHD.cmake +++ b/cmake/Modules/FindUHD.cmake @@ -3,7 +3,7 @@ ######################################################################## INCLUDE(FindPkgConfig) -PKG_CHECK_MODULES(PC_UHD QUIET uhd) +PKG_CHECK_MODULES(PC_UHD uhd) FIND_PATH( UHD_INCLUDE_DIRS diff --git a/cmake/Modules/GrPackage.cmake b/cmake/Modules/GrPackage.cmake index a36ad9162..3aca79632 100644 --- a/cmake/Modules/GrPackage.cmake +++ b/cmake/Modules/GrPackage.cmake @@ -103,7 +103,7 @@ endfunction(CPACK_COMPONENT) set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "GNU Radio - The GNU Software Radio") set(CPACK_PACKAGE_VENDOR "Free Software Foundation, Inc.") set(CPACK_PACKAGE_CONTACT "Discuss GNURadio <discuss-gnuradio@gnu.org>") -set(CPACK_PACKAGE_VERSION ${VERSION}) +string(REPLACE "v" "" CPACK_PACKAGE_VERSION ${VERSION}) set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/README) set(CPACK_RESOURCE_FILE_README ${CMAKE_SOURCE_DIR}/README) set(CPACK_RESOURCE_FILE_WELCOME ${CMAKE_SOURCE_DIR}/README) @@ -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/GrPlatform.cmake b/cmake/Modules/GrPlatform.cmake index ce2e15fef..dde65cee5 100644 --- a/cmake/Modules/GrPlatform.cmake +++ b/cmake/Modules/GrPlatform.cmake @@ -37,10 +37,18 @@ if(LINUX AND EXISTS "/etc/redhat-release") set(REDHAT TRUE) endif() +if(LINUX AND EXISTS "/etc/slackware-version") + set(SLACKWARE TRUE) +endif() + ######################################################################## # when the library suffix should be 64 (applies to redhat linux family) ######################################################################## -if(NOT DEFINED LIB_SUFFIX AND REDHAT AND CMAKE_SYSTEM_PROCESSOR MATCHES "64$") +if (REDHAT OR SLACKWARE) + set(LIB64_CONVENTION TRUE) +endif() + +if(NOT DEFINED LIB_SUFFIX AND LIB64_CONVENTION AND CMAKE_SYSTEM_PROCESSOR MATCHES "64$") set(LIB_SUFFIX 64) endif() set(LIB_SUFFIX ${LIB_SUFFIX} CACHE STRING "lib directory suffix") 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/Packaging/Fedora-15.cmake b/cmake/Packaging/Fedora-15.cmake index 1ec017a7a..278d68990 100644 --- a/cmake/Packaging/Fedora-15.cmake +++ b/cmake/Packaging/Fedora-15.cmake @@ -1,10 +1,10 @@ SET(PACKAGE_DEPENDS_GRUEL_RUNTIME "boost-python" "glibc") SET(PACKAGE_DEPENDS_GRUEL_PYTHON "python") SET(PACKAGE_DEPENDS_CORE_RUNTIME "fftw-libs" "gsl") -SET(PACKAGE_DEPENDS_QTGUI_RUNTIME "qt" "qwt4") +SET(PACKAGE_DEPENDS_QTGUI_RUNTIME "qt" "qwt") SET(PACKAGE_DEPENDS_QTGUI_PYTHON "PyQt4" "PyQwt") SET(PACKAGE_DEPENDS_GRC "python" "numpy" "gtk2" "python-lxml" "python-cheetah") -SET(PACKAGE_DEPENDS_WXGUI "python-wxgtk2.8" "python" "numpy") +SET(PACKAGE_DEPENDS_WXGUI "wxGTK" "python" "numpy") SET(PACKAGE_DEPENDS_VIDEO_SDL_RUNTIME "SDL") SET(PACKAGE_DEPENDS_UHD_RUNTIME "uhd") SET(PACKAGE_DEPENDS_AUDIO_RUNTIME "pulseaudio" "alsa-lib" "jack-audio-connection-kit") 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 |