Mercurial > hg > orthanc

changeset 2403:06536b4f30c0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rename USE_GOOGLE_TEST_DEBIAN_SOURCE_PACKAGE as USE_GOOGLE_TEST_DEBIAN_PACKAGE
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 08 Sep 2017 16:34:47 +0200
parents 741765ec8374
children e6af2c5cd0f1
files .travis.yml CMakeLists.txt LinuxCompilation.txt Resources/CMake/GoogleTestConfiguration.cmake Resources/OldBuildInstructions.txt
diffstat 5 files changed, 11 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/.travis.yml	Fri Sep 08 16:32:59 2017 +0200
+++ b/.travis.yml	Fri Sep 08 16:34:47 2017 +0200
@@ -44,7 +44,7 @@
   - if [ $TRAVIS_OS_NAME == linux -a $TRAVIS_MINGW == OFF ]; then cmake
     -DCMAKE_BUILD_TYPE=Debug "-DDCMTK_LIBRARIES=CharLS;dcmjpls;wrap;oflog"
     -DALLOW_DOWNLOADS=ON -DUSE_SYSTEM_BOOST=OFF -DUSE_SYSTEM_MONGOOSE=OFF -DUSE_SYSTEM_JSONCPP=OFF
-    -DUSE_SYSTEM_GOOGLE_LOG=OFF -DUSE_SYSTEM_PUGIXML=OFF -DUSE_GOOGLE_TEST_DEBIAN_SOURCE_PACKAGE=ON
+    -DUSE_SYSTEM_GOOGLE_LOG=OFF -DUSE_SYSTEM_PUGIXML=OFF -DUSE_GOOGLE_TEST_DEBIAN_PACKAGE=ON
     ..; fi
   - if [ $TRAVIS_OS_NAME == linux -a $TRAVIS_MINGW == ON ]; then cmake
     -DCMAKE_BUILD_TYPE=Debug -DSTATIC_BUILD=ON -DSTANDALONE_BUILD=ON -DALLOW_DOWNLOADS=ON
--- a/CMakeLists.txt	Fri Sep 08 16:32:59 2017 +0200
+++ b/CMakeLists.txt	Fri Sep 08 16:34:47 2017 +0200
@@ -37,10 +37,10 @@
 SET(UNIT_TESTS_WITH_HTTP_CONNEXIONS ON CACHE BOOL "Allow unit tests to make HTTP requests")
 
 # Advanced parameters to fine-tune linking against system libraries
-SET(USE_GOOGLE_TEST_DEBIAN_SOURCE_PACKAGE OFF CACHE BOOL "Use the sources of Google Test shipped with libgtest-dev (Debian only)")
+SET(USE_GOOGLE_TEST_DEBIAN_PACKAGE OFF CACHE BOOL "Use the sources of Google Test shipped with libgtest-dev (Debian only)")
 SET(USE_SYSTEM_GOOGLE_TEST ON CACHE BOOL "Use the system version of Google Test")
 
-mark_as_advanced(USE_GOOGLE_TEST_DEBIAN_SOURCE_PACKAGE)
+mark_as_advanced(USE_GOOGLE_TEST_DEBIAN_PACKAGE)
 
 
 #####################################################################
--- a/LinuxCompilation.txt	Fri Sep 08 16:32:59 2017 +0200
+++ b/LinuxCompilation.txt	Fri Sep 08 16:34:47 2017 +0200
@@ -86,7 +86,7 @@
 
 # cmake -DALLOW_DOWNLOADS=ON \
 	-DUSE_SYSTEM_MONGOOSE=OFF \
-        -DUSE_GOOGLE_TEST_DEBIAN_SOURCE_PACKAGE=ON \
+        -DUSE_GOOGLE_TEST_DEBIAN_PACKAGE=ON \
         -DDCMTK_LIBRARIES=dcmjpls \
 	~/Orthanc
 
@@ -108,7 +108,7 @@
 	-DUSE_SYSTEM_MONGOOSE=OFF \
 	-DUSE_SYSTEM_JSONCPP=OFF \
 	-DUSE_SYSTEM_PUGIXML=OFF \
-        -DUSE_GOOGLE_TEST_DEBIAN_SOURCE_PACKAGE=ON \
+        -DUSE_GOOGLE_TEST_DEBIAN_PACKAGE=ON \
 	~/Orthanc
 
 
@@ -123,7 +123,7 @@
                        libcharls-dev libjsoncpp-dev libpugixml-dev
 
 # cmake -DALLOW_DOWNLOADS=ON \
-        -DUSE_GOOGLE_TEST_DEBIAN_SOURCE_PACKAGE=ON \
+        -DUSE_GOOGLE_TEST_DEBIAN_PACKAGE=ON \
         -DUSE_SYSTEM_MONGOOSE=OFF \
         -DDCMTK_LIBRARIES=dcmjpls \
         ~/Orthanc
--- a/Resources/CMake/GoogleTestConfiguration.cmake	Fri Sep 08 16:32:59 2017 +0200
+++ b/Resources/CMake/GoogleTestConfiguration.cmake	Fri Sep 08 16:34:47 2017 +0200
@@ -1,4 +1,4 @@
-if (USE_GOOGLE_TEST_DEBIAN_SOURCE_PACKAGE)
+if (USE_GOOGLE_TEST_DEBIAN_PACKAGE)
   find_path(GOOGLE_TEST_DEBIAN_SOURCES_DIR
     NAMES src/gtest-all.cc
     PATHS
--- a/Resources/OldBuildInstructions.txt	Fri Sep 08 16:32:59 2017 +0200
+++ b/Resources/OldBuildInstructions.txt	Fri Sep 08 16:34:47 2017 +0200
@@ -32,7 +32,7 @@
 # cmake -DALLOW_DOWNLOADS=ON \
         -DUSE_SYSTEM_GOOGLE_LOG=OFF \
 	-DUSE_SYSTEM_MONGOOSE=OFF \
-        -DUSE_GOOGLE_TEST_DEBIAN_SOURCE_PACKAGE=ON \
+        -DUSE_GOOGLE_TEST_DEBIAN_PACKAGE=ON \
 	-DUSE_SYSTEM_PUGIXML=OFF \
         -DENABLE_JPEG=OFF \
         -DENABLE_JPEG_LOSSLESS=OFF \
@@ -55,7 +55,7 @@
         -DALLOW_DOWNLOADS=ON \
 	-DUSE_SYSTEM_MONGOOSE=OFF \
 	-DUSE_SYSTEM_JSONCPP=OFF \
-        -DUSE_GOOGLE_TEST_DEBIAN_SOURCE_PACKAGE=ON \
+        -DUSE_GOOGLE_TEST_DEBIAN_PACKAGE=ON \
 	-DUSE_SYSTEM_PUGIXML=OFF \
 	~/Orthanc
 
@@ -66,7 +66,7 @@
         -DALLOW_DOWNLOADS=ON \
 	-DUSE_SYSTEM_MONGOOSE=OFF \
 	-DUSE_SYSTEM_JSONCPP=OFF \
-        -DUSE_GOOGLE_TEST_DEBIAN_SOURCE_PACKAGE=ON \
+        -DUSE_GOOGLE_TEST_DEBIAN_PACKAGE=ON \
 	-DUSE_SYSTEM_PUGIXML=OFF \
         -DENABLE_JPEG=OFF \
         -DENABLE_JPEG_LOSSLESS=OFF \
@@ -85,7 +85,7 @@
 # cmake "-DDCMTK_LIBRARIES=wrap;oflog" \
         -DALLOW_DOWNLOADS=ON \
 	-DUSE_SYSTEM_MONGOOSE=OFF \
-        -DUSE_GOOGLE_TEST_DEBIAN_SOURCE_PACKAGE=ON \
+        -DUSE_GOOGLE_TEST_DEBIAN_PACKAGE=ON \
 	-DUSE_SYSTEM_PUGIXML=OFF \
         -DENABLE_JPEG=OFF \
         -DENABLE_JPEG_LOSSLESS=OFF \