Fixing detection of GTEST_DIR variable when defined with -DGTEST_DIR=...

This commit is contained in:
Carles Fernandez 2014-05-28 22:02:11 +02:00
parent 31b4738d39
commit 36a587762b
2 changed files with 7 additions and 1 deletions

View File

@ -198,7 +198,6 @@ endif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
enable_testing()
if(EXISTS $ENV{GTEST_DIR})
set(GTEST_DIR $ENV{GTEST_DIR})
message("++++++++++++++++++HEllo")
endif(EXISTS $ENV{GTEST_DIR})
if(GTEST_DIR)
message(STATUS "GTEST root folder at ${GTEST_DIR}")

View File

@ -16,7 +16,14 @@
# along with GNSS-SDR. If not, see <http://www.gnu.org/licenses/>.
#
if(EXISTS $ENV{GTEST_DIR})
set(GTEST_DIR_LOCAL $ENV{GTEST_DIR})
endif(EXISTS $ENV{GTEST_DIR})
set(GTEST_DIR_LOCAL "$ENV{GTEST_DIR}")
if(GTEST_DIR)
set(GTEST_DIR_LOCAL ${GTEST_DIR})
endif(GTEST_DIR)
if(NOT GTEST_DIR_LOCAL)
set(GTEST_DIR_LOCAL false CACHE STRING "Gtest downloaded and built automatically" FORCE)
else()