Mercurial > hg > orthanc
changeset 643:8d1382acee29
merge
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Tue, 29 Oct 2013 17:05:02 +0100 |
| parents | 9a85a2ac1005 (current diff) a5f291f05bba (diff) |
| children | eb5a0b21d05e |
| files | |
| diffstat | 3 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/CMakeLists.txt Tue Oct 29 17:04:35 2013 +0100 +++ b/CMakeLists.txt Tue Oct 29 17:05:02 2013 +0100 @@ -31,8 +31,8 @@ SET(USE_SYSTEM_CURL ON CACHE BOOL "Use the system version of LibCurl") # Distribution-specific settings -SET(USE_GTEST_DEBIAN_PACKAGE OFF CACHE BOOL "Use the sources of Google Test shipped with libgtest-dev (Debian only)") -mark_as_advanced(USE_GTEST_DEBIAN_PACKAGE) +SET(USE_GTEST_DEBIAN_SOURCE_PACKAGE OFF CACHE BOOL "Use the sources of Google Test shipped with libgtest-dev (Debian only)") +mark_as_advanced(USE_GTEST_DEBIAN_SOURCE_PACKAGE) # Some basic inclusions include(CheckIncludeFiles)
--- a/LinuxCompilation.txt Tue Oct 29 17:04:35 2013 +0100 +++ b/LinuxCompilation.txt Tue Oct 29 17:05:02 2013 +0100 @@ -65,7 +65,7 @@ # sudo apt-get install build-essential unzip cmake mercurial \ uuid-dev libcurl4-openssl-dev liblua5.1-0-dev \ - libgoogle-glog-dev libpng-dev \ + libgoogle-glog-dev libpng-dev libgtest-dev \ libsqlite3-dev libssl-dev zlib1g-dev # cmake -DALLOW_DOWNLOADS=ON \ @@ -88,7 +88,7 @@ # cmake "-DDCMTK_LIBRARIES=wrap;oflog" \ -DALLOW_DOWNLOADS=ON \ -DUSE_SYSTEM_MONGOOSE=OFF \ - -DUSE_GTEST_DEBIAN_PACKAGE=ON \ + -DUSE_GTEST_DEBIAN_SOURCE_PACKAGE=ON \ -DDCMTK_DICTIONARY_DIR:PATH=/usr/share/libdcmtk2 \ ~/Orthanc @@ -110,7 +110,7 @@ -DALLOW_DOWNLOADS=ON \ -DUSE_SYSTEM_MONGOOSE=OFF \ -DUSE_SYSTEM_JSONCPP=OFF \ - -DUSE_GTEST_DEBIAN_PACKAGE=ON \ + -DUSE_GTEST_DEBIAN_SOURCE_PACKAGE=ON \ ~/Orthanc
--- a/Resources/CMake/GoogleTestConfiguration.cmake Tue Oct 29 17:04:35 2013 +0100 +++ b/Resources/CMake/GoogleTestConfiguration.cmake Tue Oct 29 17:05:02 2013 +0100 @@ -1,4 +1,4 @@ -if (USE_GTEST_DEBIAN_PACKAGE) +if (USE_GTEST_DEBIAN_SOURCE_PACKAGE) set(GTEST_SOURCES /usr/src/gtest/src/gtest-all.cc) include_directories(/usr/src/gtest)