Mercurial > hg > orthanc
comparison Resources/CMake/GoogleTestConfiguration.cmake @ 1092:88fcf73fbe39
Upgrade to Google Test 1.7.0
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Tue, 05 Aug 2014 12:36:53 +0200 |
parents | 4b4ab35c04f5 |
children | fbf763bb1fa3 6784a119484d |
comparison
equal
deleted
inserted
replaced
1091:a66224eec125 | 1092:88fcf73fbe39 |
---|---|
6 NOT EXISTS ${GTEST_SOURCES}) | 6 NOT EXISTS ${GTEST_SOURCES}) |
7 message(FATAL_ERROR "Please install the libgtest-dev package") | 7 message(FATAL_ERROR "Please install the libgtest-dev package") |
8 endif() | 8 endif() |
9 | 9 |
10 elseif (STATIC_BUILD OR NOT USE_SYSTEM_GOOGLE_TEST) | 10 elseif (STATIC_BUILD OR NOT USE_SYSTEM_GOOGLE_TEST) |
11 SET(GTEST_SOURCES_DIR ${CMAKE_BINARY_DIR}/gtest-1.6.0) | 11 set(GTEST_SOURCES_DIR ${CMAKE_BINARY_DIR}/gtest-1.7.0) |
12 DownloadPackage( | 12 DownloadPackage( |
13 "4577b49f2973c90bf9ba69aa8166b786" | 13 "2d6ec8ccdf5c46b05ba54a9fd1d130d7" |
14 "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/gtest-1.6.0.zip" | 14 "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/gtest-1.7.0.zip" |
15 "${GTEST_SOURCES_DIR}") | 15 "${GTEST_SOURCES_DIR}") |
16 | 16 |
17 include_directories( | 17 include_directories( |
18 ${GTEST_SOURCES_DIR}/include | 18 ${GTEST_SOURCES_DIR}/include |
19 ${GTEST_SOURCES_DIR} | 19 ${GTEST_SOURCES_DIR} |