Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(100)

Side by Side Diff: testing/gmock/scripts/gmock-config.in

Issue 140003: Upgrade gtest to r267 and gmock to r173. (Closed)
Patch Set: final fileset. Created 11 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 #!/bin/sh 1 #!/bin/sh
2 2
3 # These variables are automatically filled in by the configure script. 3 # These variables are automatically filled in by the configure script.
4 name="@PACKAGE_TARNAME@" 4 name="@PACKAGE_TARNAME@"
5 version="@PACKAGE_VERSION@" 5 version="@PACKAGE_VERSION@"
6 6
7 show_usage() 7 show_usage()
8 { 8 {
9 echo "Usage: gmock-config [OPTIONS...]" 9 echo "Usage: gmock-config [OPTIONS...]"
10 } 10 }
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 exit 1 252 exit 1
253 elif ! "${gtest_config}" "--exact-version=@GTEST_VERSION@"; then 253 elif ! "${gtest_config}" "--exact-version=@GTEST_VERSION@"; then
254 echo "The Google Test found is not the same version as Google Mock was " \ 254 echo "The Google Test found is not the same version as Google Mock was " \
255 "built against" >&2 255 "built against" >&2
256 exit 1 256 exit 1
257 fi 257 fi
258 258
259 # Add the necessary Google Test bits into the various flag variables 259 # Add the necessary Google Test bits into the various flag variables
260 gmock_cppflags="${gmock_cppflags} `${gtest_config} --cppflags`" 260 gmock_cppflags="${gmock_cppflags} `${gtest_config} --cppflags`"
261 gmock_cxxflags="${gmock_cxxflags} `${gtest_config} --cxxflags`" 261 gmock_cxxflags="${gmock_cxxflags} `${gtest_config} --cxxflags`"
262 gmock_ldflags="${gmock_ldflags}`${gtest_config} --ldflags`" 262 gmock_ldflags="${gmock_ldflags} `${gtest_config} --ldflags`"
263 gmock_libs="${gmock_libs} `${gtest_config} --libs`" 263 gmock_libs="${gmock_libs} `${gtest_config} --libs`"
264 264
265 # Do an installation query if requested. 265 # Do an installation query if requested.
266 if test -n "$do_query"; then 266 if test -n "$do_query"; then
267 case $do_query in 267 case $do_query in
268 prefix) echo $prefix; exit 0;; 268 prefix) echo $prefix; exit 0;;
269 exec-prefix) echo $exec_prefix; exit 0;; 269 exec-prefix) echo $exec_prefix; exit 0;;
270 libdir) echo $libdir; exit 0;; 270 libdir) echo $libdir; exit 0;;
271 includedir) echo $includedir; exit 0;; 271 includedir) echo $includedir; exit 0;;
272 version) echo $version; exit 0;; 272 version) echo $version; exit 0;;
(...skipping 21 matching lines...) Expand all
294 # Do the output in the correct order so that these can be used in-line of 294 # Do the output in the correct order so that these can be used in-line of
295 # a compiler invocation. 295 # a compiler invocation.
296 output="" 296 output=""
297 test "$echo_cppflags" = "yes" && output="$output $gmock_cppflags" 297 test "$echo_cppflags" = "yes" && output="$output $gmock_cppflags"
298 test "$echo_cxxflags" = "yes" && output="$output $gmock_cxxflags" 298 test "$echo_cxxflags" = "yes" && output="$output $gmock_cxxflags"
299 test "$echo_ldflags" = "yes" && output="$output $gmock_ldflags" 299 test "$echo_ldflags" = "yes" && output="$output $gmock_ldflags"
300 test "$echo_libs" = "yes" && output="$output $gmock_libs" 300 test "$echo_libs" = "yes" && output="$output $gmock_libs"
301 echo $output 301 echo $output
302 302
303 exit 0 303 exit 0
OLDNEW
« no previous file with comments | « testing/gmock/scripts/generator/cpp/gmock_class_test.py ('k') | testing/gmock/scripts/gmock_doctor.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698