Mercurial > hg > orthanc

comparison Resources/CMake/GoogleTestConfiguration.cmake @ 3281:ea54109a7312

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
upgrade to GoogleTest 1.8.1
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 21 Feb 2019 16:30:23 +0100
parents 0c2a8d5e0097
children a3e38994d95a
comparison
equal deleted inserted replaced
3280:fddf3ceed7e5 3281:ea54109a7312
26 NOT EXISTS ${GOOGLE_TEST_DEBIAN_INCLUDE_DIR}/gtest.h) 26 NOT EXISTS ${GOOGLE_TEST_DEBIAN_INCLUDE_DIR}/gtest.h)
27 message(FATAL_ERROR "Please install the libgtest-dev package") 27 message(FATAL_ERROR "Please install the libgtest-dev package")
28 endif() 28 endif()
29 29
30 elseif (STATIC_BUILD OR NOT USE_SYSTEM_GOOGLE_TEST) 30 elseif (STATIC_BUILD OR NOT USE_SYSTEM_GOOGLE_TEST)
31 set(GOOGLE_TEST_SOURCES_DIR ${CMAKE_BINARY_DIR}/gtest-1.7.0) 31 set(GOOGLE_TEST_SOURCES_DIR ${CMAKE_BINARY_DIR}/googletest-release-1.8.1)
32 set(GOOGLE_TEST_URL "http://orthanc.osimis.io/ThirdPartyDownloads/gtest-1.7.0.zip") 32 set(GOOGLE_TEST_URL "http://orthanc.osimis.io/ThirdPartyDownloads/gtest-1.8.1.tar.gz")
33 set(GOOGLE_TEST_MD5 "2d6ec8ccdf5c46b05ba54a9fd1d130d7") 33 set(GOOGLE_TEST_MD5 "2e6fbeb6a91310a16efe181886c59596")
34 34
35 DownloadPackage(${GOOGLE_TEST_MD5} ${GOOGLE_TEST_URL} "${GOOGLE_TEST_SOURCES_DIR}") 35 DownloadPackage(${GOOGLE_TEST_MD5} ${GOOGLE_TEST_URL} "${GOOGLE_TEST_SOURCES_DIR}")
36 36
37 include_directories( 37 include_directories(
38 ${GOOGLE_TEST_SOURCES_DIR}/include 38 ${GOOGLE_TEST_SOURCES_DIR}/googletest
39 ${GOOGLE_TEST_SOURCES_DIR}/googletest/include
39 ${GOOGLE_TEST_SOURCES_DIR} 40 ${GOOGLE_TEST_SOURCES_DIR}
40 ) 41 )
41 42
42 set(GOOGLE_TEST_SOURCES 43 set(GOOGLE_TEST_SOURCES
43 ${GOOGLE_TEST_SOURCES_DIR}/src/gtest-all.cc 44 ${GOOGLE_TEST_SOURCES_DIR}/googletest/src/gtest-all.cc
44 ) 45 )
45 46
46 # https://code.google.com/p/googletest/issues/detail?id=412 47 # https://code.google.com/p/googletest/issues/detail?id=412
47 if (MSVC) # VS2012 does not support tuples correctly yet 48 if (MSVC) # VS2012 does not support tuples correctly yet
48 add_definitions(/D _VARIADIC_MAX=10) 49 add_definitions(/D _VARIADIC_MAX=10)