mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-01-31 03:14:56 +00:00
Code Issues Releases Wiki Activity

Merge branch 'next' of https://github.com/carlesfernandez/gnss-sdr into next

Browse Source
This commit is contained in:
Carles Fernandez 2019-02-07 19:45:48 +01:00
commit 08135f19c8
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -465,7 +465,7 @@ if(ENABLE_UNIT_TESTING OR ENABLE_SYSTEM_TESTING)
endif() endif()
if(GTEST_DIR) if(GTEST_DIR)
message(STATUS "Googletest root folder set at ${GTEST_DIR}") message(STATUS "Googletest root folder set at ${GTEST_DIR}")
find_path(LIBGTEST_DEV_DIR NAMES googletest/src/gtest-all.cc PATHS ${GTEST_DIR}) find_path(LIBGTEST_DEV_DIR NAMES src/gtest-all.cc PATHS ${GTEST_DIR} ${GTEST_DIR}/googletest)
if(LIBGTEST_DEV_DIR) if(LIBGTEST_DEV_DIR)
message(STATUS "Googletest has been found.") message(STATUS "Googletest has been found.")
else() else()

4
src/tests/CMakeLists.txt
View File

@ -112,12 +112,12 @@ if(NOT ${GTEST_DIR_LOCAL})
else() else()
if(GTEST_INCLUDE_DIRS) if(GTEST_INCLUDE_DIRS)
set(GTEST_INCLUDE_DIRECTORIES ${GTEST_INCLUDE_DIRS} ${LIBGTEST_DEV_DIR}) set(GTEST_INCLUDE_DIRECTORIES ${GTEST_INCLUDE_DIRS} ${LIBGTEST_DEV_DIR})
add_library(gtest STATIC ${LIBGTEST_DEV_DIR}/googletest/src/gtest-all.cc) add_library(gtest STATIC ${LIBGTEST_DEV_DIR}/src/gtest-all.cc)
target_include_directories(gtest target_include_directories(gtest
PUBLIC PUBLIC
${GTEST_INCLUDE_DIRECTORIES} ${GTEST_INCLUDE_DIRECTORIES}
) )
add_library(gtest_main STATIC ${LIBGTEST_DEV_DIR}/googletest/src/gtest_main.cc) add_library(gtest_main STATIC ${LIBGTEST_DEV_DIR}/src/gtest_main.cc)
target_include_directories(gtest_main target_include_directories(gtest_main
PUBLIC PUBLIC
${GTEST_INCLUDE_DIRECTORIES} ${GTEST_INCLUDE_DIRECTORIES}