Mercurial > hg > orthanc

changeset 2402:741765ec8374

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rename GTEST_ as GOOGLE_TEST_
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 08 Sep 2017 16:32:59 +0200
parents a051aba0037c
children 06536b4f30c0
files .travis.yml CMakeLists.txt LinuxCompilation.txt Resources/CMake/GoogleTestConfiguration.cmake Resources/OldBuildInstructions.txt
diffstat 5 files changed, 32 insertions(+), 32 deletions(-) [+]
line wrap: on
line diff
--- a/.travis.yml	Sat Sep 02 11:50:08 2017 +0200
+++ b/.travis.yml	Fri Sep 08 16:32:59 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_GTEST_DEBIAN_SOURCE_PACKAGE=ON
+    -DUSE_SYSTEM_GOOGLE_LOG=OFF -DUSE_SYSTEM_PUGIXML=OFF -DUSE_GOOGLE_TEST_DEBIAN_SOURCE_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	Sat Sep 02 11:50:08 2017 +0200
+++ b/CMakeLists.txt	Fri Sep 08 16:32:59 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_GTEST_DEBIAN_SOURCE_PACKAGE OFF CACHE BOOL "Use the sources of Google Test shipped with libgtest-dev (Debian only)")
+SET(USE_GOOGLE_TEST_DEBIAN_SOURCE_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_GTEST_DEBIAN_SOURCE_PACKAGE)
+mark_as_advanced(USE_GOOGLE_TEST_DEBIAN_SOURCE_PACKAGE)
 
 
 #####################################################################
@@ -314,7 +314,7 @@
 #####################################################################
 
 add_executable(UnitTests
-  ${GTEST_SOURCES}
+  ${GOOGLE_TEST_SOURCES}
   ${ORTHANC_UNIT_TESTS_PCH}
   ${ORTHANC_UNIT_TESTS_SOURCES}
   )
--- a/LinuxCompilation.txt	Sat Sep 02 11:50:08 2017 +0200
+++ b/LinuxCompilation.txt	Fri Sep 08 16:32:59 2017 +0200
@@ -86,7 +86,7 @@
 
 # cmake -DALLOW_DOWNLOADS=ON \
 	-DUSE_SYSTEM_MONGOOSE=OFF \
-        -DUSE_GTEST_DEBIAN_SOURCE_PACKAGE=ON \
+        -DUSE_GOOGLE_TEST_DEBIAN_SOURCE_PACKAGE=ON \
         -DDCMTK_LIBRARIES=dcmjpls \
 	~/Orthanc
 
@@ -108,7 +108,7 @@
 	-DUSE_SYSTEM_MONGOOSE=OFF \
 	-DUSE_SYSTEM_JSONCPP=OFF \
 	-DUSE_SYSTEM_PUGIXML=OFF \
-        -DUSE_GTEST_DEBIAN_SOURCE_PACKAGE=ON \
+        -DUSE_GOOGLE_TEST_DEBIAN_SOURCE_PACKAGE=ON \
 	~/Orthanc
 
 
@@ -123,7 +123,7 @@
                        libcharls-dev libjsoncpp-dev libpugixml-dev
 
 # cmake -DALLOW_DOWNLOADS=ON \
-        -DUSE_GTEST_DEBIAN_SOURCE_PACKAGE=ON \
+        -DUSE_GOOGLE_TEST_DEBIAN_SOURCE_PACKAGE=ON \
         -DUSE_SYSTEM_MONGOOSE=OFF \
         -DDCMTK_LIBRARIES=dcmjpls \
         ~/Orthanc
--- a/Resources/CMake/GoogleTestConfiguration.cmake	Sat Sep 02 11:50:08 2017 +0200
+++ b/Resources/CMake/GoogleTestConfiguration.cmake	Fri Sep 08 16:32:59 2017 +0200
@@ -1,5 +1,5 @@
-if (USE_GTEST_DEBIAN_SOURCE_PACKAGE)
-  find_path(GTEST_DEBIAN_SOURCES_DIR
+if (USE_GOOGLE_TEST_DEBIAN_SOURCE_PACKAGE)
+  find_path(GOOGLE_TEST_DEBIAN_SOURCES_DIR
     NAMES src/gtest-all.cc
     PATHS
     /usr/src/gtest
@@ -7,37 +7,37 @@
     PATH_SUFFIXES src
     )
 
-  find_path(GTEST_DEBIAN_INCLUDE_DIR
+  find_path(GOOGLE_TEST_DEBIAN_INCLUDE_DIR
     NAMES gtest.h
     PATHS
     /usr/include/gtest
     )
 
-  message("Path to the Debian Google Test sources: ${GTEST_DEBIAN_SOURCES_DIR}")
-  message("Path to the Debian Google Test includes: ${GTEST_DEBIAN_INCLUDE_DIR}")
+  message("Path to the Debian Google Test sources: ${GOOGLE_TEST_DEBIAN_SOURCES_DIR}")
+  message("Path to the Debian Google Test includes: ${GOOGLE_TEST_DEBIAN_INCLUDE_DIR}")
 
-  set(GTEST_SOURCES ${GTEST_DEBIAN_SOURCES_DIR}/src/gtest-all.cc)
-  include_directories(${GTEST_DEBIAN_SOURCES_DIR})
+  set(GOOGLE_TEST_SOURCES ${GOOGLE_TEST_DEBIAN_SOURCES_DIR}/src/gtest-all.cc)
+  include_directories(${GOOGLE_TEST_DEBIAN_SOURCES_DIR})
 
-  if (NOT EXISTS ${GTEST_SOURCES} OR
-      NOT EXISTS ${GTEST_DEBIAN_INCLUDE_DIR}/gtest.h)
+  if (NOT EXISTS ${GOOGLE_TEST_SOURCES} OR
+      NOT EXISTS ${GOOGLE_TEST_DEBIAN_INCLUDE_DIR}/gtest.h)
     message(FATAL_ERROR "Please install the libgtest-dev package")
   endif()
 
 elseif (STATIC_BUILD OR NOT USE_SYSTEM_GOOGLE_TEST)
-  set(GTEST_SOURCES_DIR ${CMAKE_BINARY_DIR}/gtest-1.7.0)
-  set(GTEST_URL "http://www.orthanc-server.com/downloads/third-party/gtest-1.7.0.zip")
-  set(GTEST_MD5 "2d6ec8ccdf5c46b05ba54a9fd1d130d7")
+  set(GOOGLE_TEST_SOURCES_DIR ${CMAKE_BINARY_DIR}/gtest-1.7.0)
+  set(GOOGLE_TEST_URL "http://www.orthanc-server.com/downloads/third-party/gtest-1.7.0.zip")
+  set(GOOGLE_TEST_MD5 "2d6ec8ccdf5c46b05ba54a9fd1d130d7")
 
-  DownloadPackage(${GTEST_MD5} ${GTEST_URL} "${GTEST_SOURCES_DIR}")
+  DownloadPackage(${GOOGLE_TEST_MD5} ${GOOGLE_TEST_URL} "${GOOGLE_TEST_SOURCES_DIR}")
 
   include_directories(
-    ${GTEST_SOURCES_DIR}/include
-    ${GTEST_SOURCES_DIR}
+    ${GOOGLE_TEST_SOURCES_DIR}/include
+    ${GOOGLE_TEST_SOURCES_DIR}
     )
 
-  set(GTEST_SOURCES
-    ${GTEST_SOURCES_DIR}/src/gtest-all.cc
+  set(GOOGLE_TEST_SOURCES
+    ${GOOGLE_TEST_SOURCES_DIR}/src/gtest-all.cc
     )
 
   # https://code.google.com/p/googletest/issues/detail?id=412
@@ -45,14 +45,14 @@
     add_definitions(/D _VARIADIC_MAX=10)
   endif()
 
-  source_group(ThirdParty\\GoogleTest REGULAR_EXPRESSION ${GTEST_SOURCES_DIR}/.*)
+  source_group(ThirdParty\\GoogleTest REGULAR_EXPRESSION ${GOOGLE_TEST_SOURCES_DIR}/.*)
 
 else()
   include(FindGTest)
-  if (NOT GTEST_FOUND)
+  if (NOT GOOGLE_TEST_FOUND)
     message(FATAL_ERROR "Unable to find GoogleTest")
   endif()
 
-  include_directories(${GTEST_INCLUDE_DIRS})
-  link_libraries(${GTEST_LIBRARIES})
+  include_directories(${GOOGLE_TEST_INCLUDE_DIRS})
+  link_libraries(${GOOGLE_TEST_LIBRARIES})
 endif()
--- a/Resources/OldBuildInstructions.txt	Sat Sep 02 11:50:08 2017 +0200
+++ b/Resources/OldBuildInstructions.txt	Fri Sep 08 16:32:59 2017 +0200
@@ -32,7 +32,7 @@
 # cmake -DALLOW_DOWNLOADS=ON \
         -DUSE_SYSTEM_GOOGLE_LOG=OFF \
 	-DUSE_SYSTEM_MONGOOSE=OFF \
-        -DUSE_GTEST_DEBIAN_SOURCE_PACKAGE=ON \
+        -DUSE_GOOGLE_TEST_DEBIAN_SOURCE_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_GTEST_DEBIAN_SOURCE_PACKAGE=ON \
+        -DUSE_GOOGLE_TEST_DEBIAN_SOURCE_PACKAGE=ON \
 	-DUSE_SYSTEM_PUGIXML=OFF \
 	~/Orthanc
 
@@ -66,7 +66,7 @@
         -DALLOW_DOWNLOADS=ON \
 	-DUSE_SYSTEM_MONGOOSE=OFF \
 	-DUSE_SYSTEM_JSONCPP=OFF \
-        -DUSE_GTEST_DEBIAN_SOURCE_PACKAGE=ON \
+        -DUSE_GOOGLE_TEST_DEBIAN_SOURCE_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_GTEST_DEBIAN_SOURCE_PACKAGE=ON \
+        -DUSE_GOOGLE_TEST_DEBIAN_SOURCE_PACKAGE=ON \
 	-DUSE_SYSTEM_PUGIXML=OFF \
         -DENABLE_JPEG=OFF \
         -DENABLE_JPEG_LOSSLESS=OFF \