fixed some bugs

This commit is contained in:
2019-11-18 18:05:47 -07:00
parent 336746c138
commit 8237544bf8
64 changed files with 274 additions and 348 deletions

View File

@@ -1,6 +1,6 @@
# This is the CMakeCache file.
# For build in directory: /Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-download
# It was generated by CMake: /Applications/CLion.app/Contents/bin/cmake/mac/bin/cmake
# It was generated by CMake: /usr/local/Cellar/cmake/3.15.4/bin/cmake
# You can edit this file to change values found and used by cmake.
# If you do not want to change any of the values, simply exit the editor.
# If you do want to change a value, simply edit, save, and exit the editor.
@@ -81,17 +81,17 @@ CMAKE_CACHEFILE_DIR:INTERNAL=/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-
//Major version of cmake used to create the current loaded cache
CMAKE_CACHE_MAJOR_VERSION:INTERNAL=3
//Minor version of cmake used to create the current loaded cache
CMAKE_CACHE_MINOR_VERSION:INTERNAL=14
CMAKE_CACHE_MINOR_VERSION:INTERNAL=15
//Patch version of cmake used to create the current loaded cache
CMAKE_CACHE_PATCH_VERSION:INTERNAL=5
CMAKE_CACHE_PATCH_VERSION:INTERNAL=4
//ADVANCED property for variable: CMAKE_COLOR_MAKEFILE
CMAKE_COLOR_MAKEFILE-ADVANCED:INTERNAL=1
//Path to CMake executable.
CMAKE_COMMAND:INTERNAL=/Applications/CLion.app/Contents/bin/cmake/mac/bin/cmake
CMAKE_COMMAND:INTERNAL=/usr/local/Cellar/cmake/3.15.4/bin/cmake
//Path to cpack program executable.
CMAKE_CPACK_COMMAND:INTERNAL=/Applications/CLion.app/Contents/bin/cmake/mac/bin/cpack
CMAKE_CPACK_COMMAND:INTERNAL=/usr/local/Cellar/cmake/3.15.4/bin/cpack
//Path to ctest program executable.
CMAKE_CTEST_COMMAND:INTERNAL=/Applications/CLion.app/Contents/bin/cmake/mac/bin/ctest
CMAKE_CTEST_COMMAND:INTERNAL=/usr/local/Cellar/cmake/3.15.4/bin/ctest
//Path to cache edit program executable.
CMAKE_EDIT_COMMAND:INTERNAL=/Applications/CLion.app/Contents/bin/cmake/mac/bin/ccmake
//ADVANCED property for variable: CMAKE_EXPORT_COMPILE_COMMANDS
@@ -118,7 +118,7 @@ CMAKE_NUMBER_OF_MAKEFILES:INTERNAL=1
//Platform information initialized
CMAKE_PLATFORM_INFO_INITIALIZED:INTERNAL=1
//Path to CMake installation.
CMAKE_ROOT:INTERNAL=/Applications/CLion.app/Contents/bin/cmake/mac/share/cmake-3.14
CMAKE_ROOT:INTERNAL=/usr/local/Cellar/cmake/3.15.4/share/cmake
//ADVANCED property for variable: CMAKE_SKIP_INSTALL_RPATH
CMAKE_SKIP_INSTALL_RPATH-ADVANCED:INTERNAL=1
//ADVANCED property for variable: CMAKE_SKIP_RPATH

View File

@@ -1,5 +1,5 @@
# CMAKE generated file: DO NOT EDIT!
# Generated by "Unix Makefiles" Generator, CMake Version 3.14
# Generated by "Unix Makefiles" Generator, CMake Version 3.15
# Relative path conversion top directories.
set(CMAKE_RELATIVE_PATH_TOP_SOURCE "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-download")

View File

@@ -1,11 +1,11 @@
# Hashes of file build rules.
c817f1f42b933271f8d44dbfafdddc89 CMakeFiles/googletest
35404bf06c53557ab1a83e7670f14412 CMakeFiles/googletest-complete
f67355659aed31604bda96ef49182b7d googletest-prefix/src/googletest-stamp/googletest-build
b50fc36992a18d771d5c170df605c51f googletest-prefix/src/googletest-stamp/googletest-configure
4ca5b3096bf272779dd2a6bab951d291 googletest-prefix/src/googletest-stamp/googletest-download
b2702013df898504768c934f5ceba5ee googletest-prefix/src/googletest-stamp/googletest-install
abc7fd22282005077948320b9b7540f9 googletest-prefix/src/googletest-stamp/googletest-mkdir
c94ee14a66f6923dc0ecae8cfbc890d1 googletest-prefix/src/googletest-stamp/googletest-patch
2885ac8702613595c396b71a0b6f8083 googletest-prefix/src/googletest-stamp/googletest-test
13caa7169c639105478ec001a3731d9d googletest-prefix/src/googletest-stamp/googletest-update
8688efca7975928f6fdbfae7b8863cd3 CMakeFiles/googletest-complete
3f293408e71093d37607e36059545793 googletest-prefix/src/googletest-stamp/googletest-build
7dc3244ab4e32236ba85e57ebbf4bf2c googletest-prefix/src/googletest-stamp/googletest-configure
9d7bf616b714074f3e1f1742f249f878 googletest-prefix/src/googletest-stamp/googletest-download
d8472f2830917eec7a4d814f2131e33d googletest-prefix/src/googletest-stamp/googletest-install
71ce382a489d634b1a89119af6019152 googletest-prefix/src/googletest-stamp/googletest-mkdir
6f49b963130582e8acdda18f405f61a7 googletest-prefix/src/googletest-stamp/googletest-patch
4435532b04d85a5b7c33e9a2af031ac2 googletest-prefix/src/googletest-stamp/googletest-test
6214a9456ddbee52a063182d6ebf3eb9 googletest-prefix/src/googletest-stamp/googletest-update

View File

@@ -1,5 +1,5 @@
# CMAKE generated file: DO NOT EDIT!
# Generated by "Unix Makefiles" Generator, CMake Version 3.14
# Generated by "Unix Makefiles" Generator, CMake Version 3.15
# The generator used is:
set(CMAKE_DEPENDS_GENERATOR "Unix Makefiles")
@@ -7,21 +7,21 @@ set(CMAKE_DEPENDS_GENERATOR "Unix Makefiles")
# The top level Makefile was generated from the following files:
set(CMAKE_MAKEFILE_DEPENDS
"CMakeCache.txt"
"/Applications/CLion.app/Contents/bin/cmake/mac/share/cmake-3.14/Modules/CMakeGenericSystem.cmake"
"/Applications/CLion.app/Contents/bin/cmake/mac/share/cmake-3.14/Modules/CMakeInitializeConfigs.cmake"
"/Applications/CLion.app/Contents/bin/cmake/mac/share/cmake-3.14/Modules/CMakeSystemSpecificInformation.cmake"
"/Applications/CLion.app/Contents/bin/cmake/mac/share/cmake-3.14/Modules/CMakeSystemSpecificInitialize.cmake"
"/Applications/CLion.app/Contents/bin/cmake/mac/share/cmake-3.14/Modules/ExternalProject.cmake"
"/Applications/CLion.app/Contents/bin/cmake/mac/share/cmake-3.14/Modules/FindGit.cmake"
"/Applications/CLion.app/Contents/bin/cmake/mac/share/cmake-3.14/Modules/FindPackageHandleStandardArgs.cmake"
"/Applications/CLion.app/Contents/bin/cmake/mac/share/cmake-3.14/Modules/FindPackageMessage.cmake"
"/Applications/CLion.app/Contents/bin/cmake/mac/share/cmake-3.14/Modules/Platform/Darwin-Initialize.cmake"
"/Applications/CLion.app/Contents/bin/cmake/mac/share/cmake-3.14/Modules/Platform/Darwin.cmake"
"/Applications/CLion.app/Contents/bin/cmake/mac/share/cmake-3.14/Modules/Platform/UnixPaths.cmake"
"/Applications/CLion.app/Contents/bin/cmake/mac/share/cmake-3.14/Modules/RepositoryInfo.txt.in"
"CMakeFiles/3.14.5/CMakeSystem.cmake"
"CMakeFiles/3.15.4/CMakeSystem.cmake"
"CMakeLists.txt"
"googletest-prefix/tmp/googletest-cfgcmd.txt.in"
"/usr/local/Cellar/cmake/3.15.4/share/cmake/Modules/CMakeGenericSystem.cmake"
"/usr/local/Cellar/cmake/3.15.4/share/cmake/Modules/CMakeInitializeConfigs.cmake"
"/usr/local/Cellar/cmake/3.15.4/share/cmake/Modules/CMakeSystemSpecificInformation.cmake"
"/usr/local/Cellar/cmake/3.15.4/share/cmake/Modules/CMakeSystemSpecificInitialize.cmake"
"/usr/local/Cellar/cmake/3.15.4/share/cmake/Modules/ExternalProject.cmake"
"/usr/local/Cellar/cmake/3.15.4/share/cmake/Modules/FindGit.cmake"
"/usr/local/Cellar/cmake/3.15.4/share/cmake/Modules/FindPackageHandleStandardArgs.cmake"
"/usr/local/Cellar/cmake/3.15.4/share/cmake/Modules/FindPackageMessage.cmake"
"/usr/local/Cellar/cmake/3.15.4/share/cmake/Modules/Platform/Darwin-Initialize.cmake"
"/usr/local/Cellar/cmake/3.15.4/share/cmake/Modules/Platform/Darwin.cmake"
"/usr/local/Cellar/cmake/3.15.4/share/cmake/Modules/Platform/UnixPaths.cmake"
"/usr/local/Cellar/cmake/3.15.4/share/cmake/Modules/RepositoryInfo.txt.in"
)
# The corresponding makefile is:

View File

@@ -1,5 +1,5 @@
# CMAKE generated file: DO NOT EDIT!
# Generated by "Unix Makefiles" Generator, CMake Version 3.14
# Generated by "Unix Makefiles" Generator, CMake Version 3.15
# Default target executed when no arguments are given to make.
default_target: all
@@ -16,11 +16,6 @@ preinstall:
.PHONY : preinstall
# The main recursive clean target
clean:
.PHONY : clean
#=============================================================================
# Special targets provided by cmake.
@@ -50,10 +45,10 @@ cmake_force:
SHELL = /bin/sh
# The CMake executable.
CMAKE_COMMAND = /Applications/CLion.app/Contents/bin/cmake/mac/bin/cmake
CMAKE_COMMAND = /usr/local/Cellar/cmake/3.15.4/bin/cmake
# The command to remove a file.
RM = /Applications/CLion.app/Contents/bin/cmake/mac/bin/cmake -E remove -f
RM = /usr/local/Cellar/cmake/3.15.4/bin/cmake -E remove -f
# Escaping for special characters.
EQUALS = =
@@ -64,6 +59,14 @@ CMAKE_SOURCE_DIR = "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-deb
# The top-level build directory on which CMake was run.
CMAKE_BINARY_DIR = "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-download"
#=============================================================================
# Directory level rules for the build root directory
# The main recursive "clean" target.
clean: CMakeFiles/googletest.dir/clean
.PHONY : clean
#=============================================================================
# Target rules for target CMakeFiles/googletest.dir
@@ -96,11 +99,6 @@ CMakeFiles/googletest.dir/clean:
$(MAKE) -f CMakeFiles/googletest.dir/build.make CMakeFiles/googletest.dir/clean
.PHONY : CMakeFiles/googletest.dir/clean
# clean rule for target.
clean: CMakeFiles/googletest.dir/clean
.PHONY : clean
#=============================================================================
# Special targets to cleanup operation of make.

View File

@@ -1,5 +1,5 @@
# CMAKE generated file: DO NOT EDIT!
# Generated by "Unix Makefiles" Generator, CMake Version 3.14
# Generated by "Unix Makefiles" Generator, CMake Version 3.15
# Delete rule output on recipe failure.
.DELETE_ON_ERROR:
@@ -34,10 +34,10 @@ cmake_force:
SHELL = /bin/sh
# The CMake executable.
CMAKE_COMMAND = /Applications/CLion.app/Contents/bin/cmake/mac/bin/cmake
CMAKE_COMMAND = /usr/local/Cellar/cmake/3.15.4/bin/cmake
# The command to remove a file.
RM = /Applications/CLion.app/Contents/bin/cmake/mac/bin/cmake -E remove -f
RM = /usr/local/Cellar/cmake/3.15.4/bin/cmake -E remove -f
# Escaping for special characters.
EQUALS = =
@@ -66,57 +66,57 @@ CMakeFiles/googletest-complete: googletest-prefix/src/googletest-stamp/googletes
CMakeFiles/googletest-complete: googletest-prefix/src/googletest-stamp/googletest-install
CMakeFiles/googletest-complete: googletest-prefix/src/googletest-stamp/googletest-test
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --blue --bold --progress-dir="/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-download/CMakeFiles" --progress-num=$(CMAKE_PROGRESS_1) "Completed 'googletest'"
/Applications/CLion.app/Contents/bin/cmake/mac/bin/cmake -E make_directory "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-download/CMakeFiles"
/Applications/CLion.app/Contents/bin/cmake/mac/bin/cmake -E touch "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-download/CMakeFiles/googletest-complete"
/Applications/CLion.app/Contents/bin/cmake/mac/bin/cmake -E touch "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-download/googletest-prefix/src/googletest-stamp/googletest-done"
/usr/local/Cellar/cmake/3.15.4/bin/cmake -E make_directory "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-download/CMakeFiles"
/usr/local/Cellar/cmake/3.15.4/bin/cmake -E touch "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-download/CMakeFiles/googletest-complete"
/usr/local/Cellar/cmake/3.15.4/bin/cmake -E touch "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-download/googletest-prefix/src/googletest-stamp/googletest-done"
googletest-prefix/src/googletest-stamp/googletest-install: googletest-prefix/src/googletest-stamp/googletest-build
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --blue --bold --progress-dir="/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-download/CMakeFiles" --progress-num=$(CMAKE_PROGRESS_2) "No install step for 'googletest'"
cd "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-build" && /Applications/CLion.app/Contents/bin/cmake/mac/bin/cmake -E echo_append
cd "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-build" && /Applications/CLion.app/Contents/bin/cmake/mac/bin/cmake -E touch "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-download/googletest-prefix/src/googletest-stamp/googletest-install"
cd "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-build" && /usr/local/Cellar/cmake/3.15.4/bin/cmake -E echo_append
cd "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-build" && /usr/local/Cellar/cmake/3.15.4/bin/cmake -E touch "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-download/googletest-prefix/src/googletest-stamp/googletest-install"
googletest-prefix/src/googletest-stamp/googletest-mkdir:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --blue --bold --progress-dir="/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-download/CMakeFiles" --progress-num=$(CMAKE_PROGRESS_3) "Creating directories for 'googletest'"
/Applications/CLion.app/Contents/bin/cmake/mac/bin/cmake -E make_directory "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-src"
/Applications/CLion.app/Contents/bin/cmake/mac/bin/cmake -E make_directory "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-build"
/Applications/CLion.app/Contents/bin/cmake/mac/bin/cmake -E make_directory "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-download/googletest-prefix"
/Applications/CLion.app/Contents/bin/cmake/mac/bin/cmake -E make_directory "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-download/googletest-prefix/tmp"
/Applications/CLion.app/Contents/bin/cmake/mac/bin/cmake -E make_directory "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-download/googletest-prefix/src/googletest-stamp"
/Applications/CLion.app/Contents/bin/cmake/mac/bin/cmake -E make_directory "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-download/googletest-prefix/src"
/Applications/CLion.app/Contents/bin/cmake/mac/bin/cmake -E make_directory "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-download/googletest-prefix/src/googletest-stamp"
/Applications/CLion.app/Contents/bin/cmake/mac/bin/cmake -E touch "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-download/googletest-prefix/src/googletest-stamp/googletest-mkdir"
/usr/local/Cellar/cmake/3.15.4/bin/cmake -E make_directory "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-src"
/usr/local/Cellar/cmake/3.15.4/bin/cmake -E make_directory "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-build"
/usr/local/Cellar/cmake/3.15.4/bin/cmake -E make_directory "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-download/googletest-prefix"
/usr/local/Cellar/cmake/3.15.4/bin/cmake -E make_directory "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-download/googletest-prefix/tmp"
/usr/local/Cellar/cmake/3.15.4/bin/cmake -E make_directory "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-download/googletest-prefix/src/googletest-stamp"
/usr/local/Cellar/cmake/3.15.4/bin/cmake -E make_directory "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-download/googletest-prefix/src"
/usr/local/Cellar/cmake/3.15.4/bin/cmake -E make_directory "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-download/googletest-prefix/src/googletest-stamp"
/usr/local/Cellar/cmake/3.15.4/bin/cmake -E touch "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-download/googletest-prefix/src/googletest-stamp/googletest-mkdir"
googletest-prefix/src/googletest-stamp/googletest-download: googletest-prefix/src/googletest-stamp/googletest-gitinfo.txt
googletest-prefix/src/googletest-stamp/googletest-download: googletest-prefix/src/googletest-stamp/googletest-mkdir
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --blue --bold --progress-dir="/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-download/CMakeFiles" --progress-num=$(CMAKE_PROGRESS_4) "Performing download step (git clone) for 'googletest'"
cd "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug" && /Applications/CLion.app/Contents/bin/cmake/mac/bin/cmake -P "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-download/googletest-prefix/tmp/googletest-gitclone.cmake"
cd "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug" && /Applications/CLion.app/Contents/bin/cmake/mac/bin/cmake -E touch "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-download/googletest-prefix/src/googletest-stamp/googletest-download"
cd "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug" && /usr/local/Cellar/cmake/3.15.4/bin/cmake -P "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-download/googletest-prefix/tmp/googletest-gitclone.cmake"
cd "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug" && /usr/local/Cellar/cmake/3.15.4/bin/cmake -E touch "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-download/googletest-prefix/src/googletest-stamp/googletest-download"
googletest-prefix/src/googletest-stamp/googletest-update: googletest-prefix/src/googletest-stamp/googletest-download
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --blue --bold --progress-dir="/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-download/CMakeFiles" --progress-num=$(CMAKE_PROGRESS_5) "Performing update step for 'googletest'"
cd "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-src" && /Applications/CLion.app/Contents/bin/cmake/mac/bin/cmake -P "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-download/googletest-prefix/tmp/googletest-gitupdate.cmake"
cd "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-src" && /usr/local/Cellar/cmake/3.15.4/bin/cmake -P "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-download/googletest-prefix/tmp/googletest-gitupdate.cmake"
googletest-prefix/src/googletest-stamp/googletest-patch: googletest-prefix/src/googletest-stamp/googletest-download
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --blue --bold --progress-dir="/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-download/CMakeFiles" --progress-num=$(CMAKE_PROGRESS_6) "No patch step for 'googletest'"
/Applications/CLion.app/Contents/bin/cmake/mac/bin/cmake -E echo_append
/Applications/CLion.app/Contents/bin/cmake/mac/bin/cmake -E touch "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-download/googletest-prefix/src/googletest-stamp/googletest-patch"
/usr/local/Cellar/cmake/3.15.4/bin/cmake -E echo_append
/usr/local/Cellar/cmake/3.15.4/bin/cmake -E touch "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-download/googletest-prefix/src/googletest-stamp/googletest-patch"
googletest-prefix/src/googletest-stamp/googletest-configure: googletest-prefix/tmp/googletest-cfgcmd.txt
googletest-prefix/src/googletest-stamp/googletest-configure: googletest-prefix/src/googletest-stamp/googletest-update
googletest-prefix/src/googletest-stamp/googletest-configure: googletest-prefix/src/googletest-stamp/googletest-patch
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --blue --bold --progress-dir="/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-download/CMakeFiles" --progress-num=$(CMAKE_PROGRESS_7) "No configure step for 'googletest'"
cd "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-build" && /Applications/CLion.app/Contents/bin/cmake/mac/bin/cmake -E echo_append
cd "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-build" && /Applications/CLion.app/Contents/bin/cmake/mac/bin/cmake -E touch "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-download/googletest-prefix/src/googletest-stamp/googletest-configure"
cd "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-build" && /usr/local/Cellar/cmake/3.15.4/bin/cmake -E echo_append
cd "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-build" && /usr/local/Cellar/cmake/3.15.4/bin/cmake -E touch "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-download/googletest-prefix/src/googletest-stamp/googletest-configure"
googletest-prefix/src/googletest-stamp/googletest-build: googletest-prefix/src/googletest-stamp/googletest-configure
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --blue --bold --progress-dir="/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-download/CMakeFiles" --progress-num=$(CMAKE_PROGRESS_8) "No build step for 'googletest'"
cd "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-build" && /Applications/CLion.app/Contents/bin/cmake/mac/bin/cmake -E echo_append
cd "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-build" && /Applications/CLion.app/Contents/bin/cmake/mac/bin/cmake -E touch "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-download/googletest-prefix/src/googletest-stamp/googletest-build"
cd "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-build" && /usr/local/Cellar/cmake/3.15.4/bin/cmake -E echo_append
cd "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-build" && /usr/local/Cellar/cmake/3.15.4/bin/cmake -E touch "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-download/googletest-prefix/src/googletest-stamp/googletest-build"
googletest-prefix/src/googletest-stamp/googletest-test: googletest-prefix/src/googletest-stamp/googletest-install
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --blue --bold --progress-dir="/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-download/CMakeFiles" --progress-num=$(CMAKE_PROGRESS_9) "No test step for 'googletest'"
cd "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-build" && /Applications/CLion.app/Contents/bin/cmake/mac/bin/cmake -E echo_append
cd "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-build" && /Applications/CLion.app/Contents/bin/cmake/mac/bin/cmake -E touch "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-download/googletest-prefix/src/googletest-stamp/googletest-test"
cd "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-build" && /usr/local/Cellar/cmake/3.15.4/bin/cmake -E echo_append
cd "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-build" && /usr/local/Cellar/cmake/3.15.4/bin/cmake -E touch "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-download/googletest-prefix/src/googletest-stamp/googletest-test"
googletest: CMakeFiles/googletest
googletest: CMakeFiles/googletest-complete

View File

@@ -1,14 +1,14 @@
file(REMOVE_RECURSE
"CMakeFiles/googletest"
"CMakeFiles/googletest-complete"
"googletest-prefix/src/googletest-stamp/googletest-build"
"googletest-prefix/src/googletest-stamp/googletest-configure"
"googletest-prefix/src/googletest-stamp/googletest-download"
"googletest-prefix/src/googletest-stamp/googletest-install"
"googletest-prefix/src/googletest-stamp/googletest-mkdir"
"googletest-prefix/src/googletest-stamp/googletest-download"
"googletest-prefix/src/googletest-stamp/googletest-update"
"googletest-prefix/src/googletest-stamp/googletest-patch"
"googletest-prefix/src/googletest-stamp/googletest-configure"
"googletest-prefix/src/googletest-stamp/googletest-build"
"googletest-prefix/src/googletest-stamp/googletest-test"
"googletest-prefix/src/googletest-stamp/googletest-update"
)
# Per-language clean rules from dependency scanning.

View File

@@ -1,3 +1,3 @@
# CMAKE generated file: DO NOT EDIT!
# Generated by "Unix Makefiles" Generator, CMake Version 3.14
# Generated by "Unix Makefiles" Generator, CMake Version 3.15

View File

@@ -1,3 +1,3 @@
# CMAKE generated file: DO NOT EDIT!
# Generated by "Unix Makefiles" Generator, CMake Version 3.14
# Generated by "Unix Makefiles" Generator, CMake Version 3.15

View File

@@ -1,5 +1,5 @@
# CMAKE generated file: DO NOT EDIT!
# Generated by "Unix Makefiles" Generator, CMake Version 3.14
# Generated by "Unix Makefiles" Generator, CMake Version 3.15
# Default target executed when no arguments are given to make.
default_target: all
@@ -39,10 +39,10 @@ cmake_force:
SHELL = /bin/sh
# The CMake executable.
CMAKE_COMMAND = /Applications/CLion.app/Contents/bin/cmake/mac/bin/cmake
CMAKE_COMMAND = /usr/local/Cellar/cmake/3.15.4/bin/cmake
# The command to remove a file.
RM = /Applications/CLion.app/Contents/bin/cmake/mac/bin/cmake -E remove -f
RM = /usr/local/Cellar/cmake/3.15.4/bin/cmake -E remove -f
# Escaping for special characters.
EQUALS = =
@@ -59,7 +59,7 @@ CMAKE_BINARY_DIR = "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-deb
# Special rule for the target rebuild_cache
rebuild_cache:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
/Applications/CLion.app/Contents/bin/cmake/mac/bin/cmake -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
/usr/local/Cellar/cmake/3.15.4/bin/cmake -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
.PHONY : rebuild_cache
# Special rule for the target rebuild_cache

View File

@@ -1,3 +1,3 @@
repository='https://github.com/google/googletest.git'
module=''
tag=''
tag='origin'

View File

@@ -1,3 +1,3 @@
repository='https://github.com/google/googletest.git'
module=''
tag=''
tag='origin'

View File

@@ -1,14 +1,5 @@
if("master" STREQUAL "")
message(FATAL_ERROR "Tag for git checkout should not be empty.")
endif()
set(run 0)
if("/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-download/googletest-prefix/src/googletest-stamp/googletest-gitinfo.txt" IS_NEWER_THAN "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-download/googletest-prefix/src/googletest-stamp/googletest-gitclone-lastrun.txt")
set(run 1)
endif()
if(NOT run)
if(NOT "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-download/googletest-prefix/src/googletest-stamp/googletest-gitinfo.txt" IS_NEWER_THAN "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-download/googletest-prefix/src/googletest-stamp/googletest-gitclone-lastrun.txt")
message(STATUS "Avoiding repeated git clone, stamp file is up to date: '/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-download/googletest-prefix/src/googletest-stamp/googletest-gitclone-lastrun.txt'")
return()
endif()
@@ -21,38 +12,12 @@ if(error_code)
message(FATAL_ERROR "Failed to remove directory: '/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-src'")
endif()
set(git_options)
# disable cert checking if explicitly told not to do it
set(tls_verify "")
if(NOT "x" STREQUAL "x" AND NOT tls_verify)
list(APPEND git_options
-c http.sslVerify=false)
endif()
set(git_clone_options)
set(git_shallow "")
if(git_shallow)
list(APPEND git_clone_options --depth 1 --no-single-branch)
endif()
set(git_progress "")
if(git_progress)
list(APPEND git_clone_options --progress)
endif()
set(git_config "")
foreach(config IN LISTS git_config)
list(APPEND git_clone_options --config ${config})
endforeach()
# try the clone 3 times in case there is an odd git clone issue
set(error_code 1)
set(number_of_tries 0)
while(error_code AND number_of_tries LESS 3)
execute_process(
COMMAND "/usr/local/bin/git" ${git_options} clone ${git_clone_options} --origin "origin" "https://github.com/google/googletest.git" "googletest-src"
COMMAND "/usr/local/bin/git" clone "https://github.com/google/googletest.git" "googletest-src"
WORKING_DIRECTORY "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug"
RESULT_VARIABLE error_code
)
@@ -67,7 +32,7 @@ if(error_code)
endif()
execute_process(
COMMAND "/usr/local/bin/git" ${git_options} checkout master --
COMMAND "/usr/local/bin/git" checkout master --
WORKING_DIRECTORY "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-src"
RESULT_VARIABLE error_code
)
@@ -76,16 +41,7 @@ if(error_code)
endif()
execute_process(
COMMAND "/usr/local/bin/git" ${git_options} submodule init
WORKING_DIRECTORY "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-src"
RESULT_VARIABLE error_code
)
if(error_code)
message(FATAL_ERROR "Failed to init submodules in: '/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-src'")
endif()
execute_process(
COMMAND "/usr/local/bin/git" ${git_options} submodule update --recursive --init
COMMAND "/usr/local/bin/git" submodule update --recursive --init
WORKING_DIRECTORY "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-src"
RESULT_VARIABLE error_code
)
@@ -99,7 +55,6 @@ execute_process(
COMMAND ${CMAKE_COMMAND} -E copy
"/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-download/googletest-prefix/src/googletest-stamp/googletest-gitinfo.txt"
"/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-download/googletest-prefix/src/googletest-stamp/googletest-gitclone-lastrun.txt"
WORKING_DIRECTORY "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-src"
RESULT_VARIABLE error_code
)
if(error_code)

View File

@@ -1,6 +1,3 @@
if("master" STREQUAL "")
message(FATAL_ERROR "Tag for git checkout should not be empty.")
endif()
execute_process(
COMMAND "/usr/local/bin/git" rev-list --max-count=1 HEAD