mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-12-13 19:50:34 +00:00
Code Issues Releases Wiki Activity

Fixes many warnings in CMake 3.0. When glog or armadillo are present in

Browse Source 
the system, glog_RELEASE/armadillo_RELEASE are not defined and several
add_dependencies were adding non-existing targets
(glog-${glog_RELEASE}). This commit creates imported logical targets
when those libraries are already present, so the warnings disappear.
This commit is contained in:
Carles Fernandez 2014-06-20 03:34:19 +02:00
parent fabf623c43
commit b2f3ecd72e
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -374,6 +374,7 @@ endif(NOT GFlags_FOUND OR LOCAL_GLOG)
################################################################################ ################################################################################
find_package(GLOG) find_package(GLOG)
set(glog_RELEASE 0.3.3)
if (NOT GLOG_FOUND OR LOCAL_GFLAGS) if (NOT GLOG_FOUND OR LOCAL_GFLAGS)
message (STATUS " glog library has not been found") message (STATUS " glog library has not been found")
if(NOT GFlags_FOUND) if(NOT GFlags_FOUND)
@ -466,6 +467,9 @@ export LIBS=${GFlags_SHARED_LIBS}
${CMAKE_CURRENT_BINARY_DIR}/glog-${glog_RELEASE}/.libs/${CMAKE_FIND_LIBRARY_PREFIXES}glog.a ${CMAKE_CURRENT_BINARY_DIR}/glog-${glog_RELEASE}/.libs/${CMAKE_FIND_LIBRARY_PREFIXES}glog.a
) )
set(LOCAL_GLOG true CACHE STRING "Glog downloaded and built automatically" FORCE) set(LOCAL_GLOG true CACHE STRING "Glog downloaded and built automatically" FORCE)
else(NOT GLOG_FOUND OR LOCAL_GFLAGS)
add_library(glog-${glog_RELEASE} UNKNOWN IMPORTED)
set_property(TARGET glog-${glog_RELEASE} PROPERTY IMPORTED_LOCATION "${GLOG_LIBRARIES}")
endif(NOT GLOG_FOUND OR LOCAL_GFLAGS) endif(NOT GLOG_FOUND OR LOCAL_GFLAGS)
@ -704,6 +708,10 @@ if(NOT ARMADILLO_FOUND)
file(COPY ${CMAKE_CURRENT_BINARY_DIR}/armadillo-${armadillo_RELEASE} file(COPY ${CMAKE_CURRENT_BINARY_DIR}/armadillo-${armadillo_RELEASE}
DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/armadillo DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/armadillo
) )
else(NOT ARMADILLO_FOUND)
set(armadillo_RELEASE ${ARMADILLO_VERSION_STRING})
add_library(armadillo-${armadillo_RELEASE} UNKNOWN IMPORTED)
set_property(TARGET armadillo-${armadillo_RELEASE} PROPERTY IMPORTED_LOCATION "${ARMADILLO_LIBRARIES}")
endif(NOT ARMADILLO_FOUND) endif(NOT ARMADILLO_FOUND)