1
0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-01-31 11:19:18 +00:00

minor fix

This commit is contained in:
Carles Fernandez 2014-11-12 23:08:06 +01:00
parent d7c8ecc230
commit 6842f49f23

View File

@ -58,11 +58,11 @@ VOLK_PYTHON_CHECK_MODULE("python >= 2.5" sys "sys.version.split()[0] >= '2.5'" P
VOLK_PYTHON_CHECK_MODULE("Cheetah >= 2.0.0" Cheetah "Cheetah.Version >= '2.0.0'" CHEETAH_FOUND) VOLK_PYTHON_CHECK_MODULE("Cheetah >= 2.0.0" Cheetah "Cheetah.Version >= '2.0.0'" CHEETAH_FOUND)
if(NOT PYTHON_MIN_VER_FOUND) if(NOT PYTHON_MIN_VER_FOUND)
message(FATAL_ERROR "Python 2.5 or greater required to build VOLK") message(FATAL_ERROR "Python 2.5 or greater required to build VOLK_GNSSSDR")
endif() endif()
if(NOT CHEETAH_FOUND) if(NOT CHEETAH_FOUND)
message(FATAL_ERROR "Cheetah templates required to build VOLK") message(FATAL_ERROR "Cheetah templates required to build VOLK_GNSSSDR")
endif() endif()
if(MSVC) if(MSVC)
@ -79,7 +79,7 @@ endif(MSVC)
include(VolkBoost) include(VolkBoost)
if(NOT Boost_FOUND) if(NOT Boost_FOUND)
message(FATAL_ERROR "VOLK Requires boost to build") message(FATAL_ERROR "VOLK_GNSSSDR Requires boost to build")
endif() endif()
option(ENABLE_ORC "Enable Orc" True) option(ENABLE_ORC "Enable Orc" True)
@ -155,12 +155,12 @@ install(
if(APPLE) if(APPLE)
if(NOT CMAKE_INSTALL_NAME_DIR) if(NOT CMAKE_INSTALL_NAME_DIR)
set(CMAKE_INSTALL_NAME_DIR set(CMAKE_INSTALL_NAME_DIR
${CMAKE_INSTALL_PREFIX}/${GR_LIBRARY_DIR} CACHE ${CMAKE_INSTALL_PREFIX}/lib CACHE
PATH "Library Install Name Destination Directory" FORCE) PATH "Library Install Name Destination Directory" FORCE)
endif(NOT CMAKE_INSTALL_NAME_DIR) endif(NOT CMAKE_INSTALL_NAME_DIR)
if(NOT CMAKE_INSTALL_RPATH) if(NOT CMAKE_INSTALL_RPATH)
set(CMAKE_INSTALL_RPATH set(CMAKE_INSTALL_RPATH
${CMAKE_INSTALL_PREFIX}/${GR_LIBRARY_DIR} CACHE ${CMAKE_INSTALL_PREFIX}/lib CACHE
PATH "Library Install RPath" FORCE) PATH "Library Install RPath" FORCE)
endif(NOT CMAKE_INSTALL_RPATH) endif(NOT CMAKE_INSTALL_RPATH)
if(NOT CMAKE_BUILD_WITH_INSTALL_RPATH) if(NOT CMAKE_BUILD_WITH_INSTALL_RPATH)