Fixing detection of GTEST_DIR environment variable

This commit is contained in:
Carles Fernandez 2014-05-28 20:24:29 +02:00
parent 571248f3f2
commit 31b4738d39
2 changed files with 5 additions and 4 deletions

View File

@ -196,9 +196,10 @@ endif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
# Googletest - http://code.google.com/p/googletest/
################################################################################
enable_testing()
if($ENV{GTEST_DIR})
if(EXISTS $ENV{GTEST_DIR})
set(GTEST_DIR $ENV{GTEST_DIR})
endif($ENV{GTEST_DIR})
message("++++++++++++++++++HEllo")
endif(EXISTS $ENV{GTEST_DIR})
if(GTEST_DIR)
message(STATUS "GTEST root folder at ${GTEST_DIR}")
else()

View File

@ -18,9 +18,9 @@
set(GTEST_DIR_LOCAL "$ENV{GTEST_DIR}")
if(NOT GTEST_DIR_LOCAL)
set(GTEST_DIR_LOCAL false)
set(GTEST_DIR_LOCAL false CACHE STRING "Gtest downloaded and built automatically" FORCE)
else()
set(GTEST_DIR_LOCAL true)
set(GTEST_DIR_LOCAL true CACHE STRING "Gtest already downloaded" FORCE)
endif(NOT GTEST_DIR_LOCAL)