mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-02-15 10:30:09 +00:00
Code Issues Releases Wiki Activity

Update GFlags to version 2.2.1

Browse Source
This commit is contained in:
Carles Fernandez 2017-07-13 17:28:08 +02:00
parent 196d84aca3
commit 95ee55d34c
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
CMakeLists.txt
View File

@ -564,7 +564,7 @@ if(NOT VOLK_GNSSSDR_FOUND)
UPDATE_COMMAND "" UPDATE_COMMAND ""
PATCH_COMMAND "" PATCH_COMMAND ""
BUILD_COMMAND ${VOLK_GNSSSDR_BUILD_COMMAND} volk_gnsssdr_profile BUILD_COMMAND ${VOLK_GNSSSDR_BUILD_COMMAND} volk_gnsssdr_profile
INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr_module/install INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr_module/install
) )
else(CMAKE_VERSION VERSION_LESS 3.2) else(CMAKE_VERSION VERSION_LESS 3.2)
ExternalProject_Add(volk_gnsssdr_module ExternalProject_Add(volk_gnsssdr_module
@ -578,7 +578,7 @@ if(NOT VOLK_GNSSSDR_FOUND)
BUILD_COMMAND ${VOLK_GNSSSDR_BUILD_COMMAND} volk_gnsssdr_profile BUILD_COMMAND ${VOLK_GNSSSDR_BUILD_COMMAND} volk_gnsssdr_profile
BUILD_BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr_module/install/lib/${CMAKE_FIND_LIBRARY_PREFIXES}volk_gnsssdr${CMAKE_STATIC_LIBRARY_SUFFIX} BUILD_BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr_module/install/lib/${CMAKE_FIND_LIBRARY_PREFIXES}volk_gnsssdr${CMAKE_STATIC_LIBRARY_SUFFIX}
${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr_module/install/bin/volk_gnsssdr_profile ${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr_module/install/bin/volk_gnsssdr_profile
INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr_module/install INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr_module/install
) )
endif(CMAKE_VERSION VERSION_LESS 3.2) endif(CMAKE_VERSION VERSION_LESS 3.2)
find_package(ORC) find_package(ORC)
@ -602,7 +602,7 @@ if(NOT VOLK_GNSSSDR_FOUND)
${CMAKE_SOURCE_DIR}/install/volk_gnsssdr_profile ${CMAKE_SOURCE_DIR}/install/volk_gnsssdr_profile
BYPRODUCTS ${CMAKE_SOURCE_DIR}/install/volk_gnsssdr_profile) BYPRODUCTS ${CMAKE_SOURCE_DIR}/install/volk_gnsssdr_profile)
endif(CMAKE_VERSION VERSION_LESS 3.2) endif(CMAKE_VERSION VERSION_LESS 3.2)
add_custom_command(TARGET volk_gnsssdr_module POST_BUILD add_custom_command(TARGET volk_gnsssdr_module POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr_module/install/bin/volk_gnsssdr-config-info COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr_module/install/bin/volk_gnsssdr-config-info
${CMAKE_SOURCE_DIR}/install/volk_gnsssdr-config-info) ${CMAKE_SOURCE_DIR}/install/volk_gnsssdr-config-info)
@ -614,13 +614,13 @@ endif(NOT VOLK_GNSSSDR_FOUND)
# gflags - https://github.com/gflags/gflags # gflags - https://github.com/gflags/gflags
################################################################################ ################################################################################
set(LOCAL_GFLAGS false) set(LOCAL_GFLAGS false)
set(gflags_RELEASE 2.2.0) set(gflags_RELEASE 2.2.1)
find_package(GFlags) find_package(GFlags)
if (NOT GFlags_FOUND) if (NOT GFlags_FOUND)
message (STATUS " gflags library has not been found.") message (STATUS " gflags library has not been found.")
message (STATUS " gflags will be downloaded and built automatically ") message (STATUS " gflags will be downloaded and built automatically ")
message (STATUS " when doing 'make'. ") message (STATUS " when doing 'make'. ")
if(CMAKE_VERSION VERSION_LESS 3.2) if(CMAKE_VERSION VERSION_LESS 3.2)
ExternalProject_Add( ExternalProject_Add(
gflags-${gflags_RELEASE} gflags-${gflags_RELEASE}
@ -651,7 +651,7 @@ if (NOT GFlags_FOUND)
INSTALL_COMMAND "" INSTALL_COMMAND ""
) )
endif(CMAKE_VERSION VERSION_LESS 3.2) endif(CMAKE_VERSION VERSION_LESS 3.2)
set(GFlags_INCLUDE_DIRS set(GFlags_INCLUDE_DIRS
${CMAKE_CURRENT_BINARY_DIR}/gflags-${gflags_RELEASE}/include CACHE PATH "Local Gflags headers" ${CMAKE_CURRENT_BINARY_DIR}/gflags-${gflags_RELEASE}/include CACHE PATH "Local Gflags headers"
) )
@ -983,7 +983,7 @@ if(NOT ARMADILLO_FOUND OR ENABLE_OWN_ARMADILLO)
BUILD_COMMAND ${CMAKE_MAKE_PROGRAM} BUILD_COMMAND ${CMAKE_MAKE_PROGRAM}
UPDATE_COMMAND "" UPDATE_COMMAND ""
INSTALL_COMMAND "" INSTALL_COMMAND ""
) )
else(CMAKE_VERSION VERSION_LESS 3.2) else(CMAKE_VERSION VERSION_LESS 3.2)
ExternalProject_Add( ExternalProject_Add(
armadillo-${armadillo_RELEASE} armadillo-${armadillo_RELEASE}