summaryrefslogtreecommitdiff
path: root/cmake/Modules
diff options
context:
space:
mode:
Diffstat (limited to 'cmake/Modules')
-rw-r--r--cmake/Modules/FindQwt.cmake8
-rw-r--r--cmake/Modules/GrPackage.cmake2
-rw-r--r--cmake/Modules/GrPython.cmake4
3 files changed, 12 insertions, 2 deletions
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..92f2567f9 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")
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)