diff --git a/Hw7&8/cmake-build-debug/CMakeCache.txt b/Hw7&8/cmake-build-debug/CMakeCache.txt index d566a84..f515f18 100644 --- a/Hw7&8/cmake-build-debug/CMakeCache.txt +++ b/Hw7&8/cmake-build-debug/CMakeCache.txt @@ -1,6 +1,6 @@ # This is the CMakeCache file. # For build in directory: /Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug -# 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. @@ -361,17 +361,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 //ADVANCED property for variable: CMAKE_CXX_COMPILER CMAKE_CXX_COMPILER-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_CXX_FLAGS @@ -496,7 +496,7 @@ CMAKE_PLATFORM_INFO_INITIALIZED:INTERNAL=1 //ADVANCED property for variable: CMAKE_RANLIB CMAKE_RANLIB-ADVANCED: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_SHARED_LINKER_FLAGS CMAKE_SHARED_LINKER_FLAGS-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_DEBUG diff --git a/Hw7&8/cmake-build-debug/CMakeFiles/CMakeDirectoryInformation.cmake b/Hw7&8/cmake-build-debug/CMakeFiles/CMakeDirectoryInformation.cmake index 6506fd5..4b8dd6c 100644 --- a/Hw7&8/cmake-build-debug/CMakeFiles/CMakeDirectoryInformation.cmake +++ b/Hw7&8/cmake-build-debug/CMakeFiles/CMakeDirectoryInformation.cmake @@ -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") diff --git a/Hw7&8/cmake-build-debug/CMakeFiles/ClangFormat.dir/build.make b/Hw7&8/cmake-build-debug/CMakeFiles/ClangFormat.dir/build.make index a6f3727..fe557ae 100644 --- a/Hw7&8/cmake-build-debug/CMakeFiles/ClangFormat.dir/build.make +++ b/Hw7&8/cmake-build-debug/CMakeFiles/ClangFormat.dir/build.make @@ -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 = = diff --git a/Hw7&8/cmake-build-debug/CMakeFiles/Makefile.cmake b/Hw7&8/cmake-build-debug/CMakeFiles/Makefile.cmake index 8698dd4..dccd25e 100644 --- a/Hw7&8/cmake-build-debug/CMakeFiles/Makefile.cmake +++ b/Hw7&8/cmake-build-debug/CMakeFiles/Makefile.cmake @@ -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,49 +7,11 @@ 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/BasicConfigVersion-AnyNewerVersion.cmake.in" - "/Applications/CLion.app/Contents/bin/cmake/mac/share/cmake-3.14/Modules/CMakeCInformation.cmake" - "/Applications/CLion.app/Contents/bin/cmake/mac/share/cmake-3.14/Modules/CMakeCXXInformation.cmake" - "/Applications/CLion.app/Contents/bin/cmake/mac/share/cmake-3.14/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake" - "/Applications/CLion.app/Contents/bin/cmake/mac/share/cmake-3.14/Modules/CMakeCommonLanguageInclude.cmake" - "/Applications/CLion.app/Contents/bin/cmake/mac/share/cmake-3.14/Modules/CMakeDependentOption.cmake" - "/Applications/CLion.app/Contents/bin/cmake/mac/share/cmake-3.14/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake" - "/Applications/CLion.app/Contents/bin/cmake/mac/share/cmake-3.14/Modules/CMakeFindCodeBlocks.cmake" - "/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/CMakeLanguageInformation.cmake" - "/Applications/CLion.app/Contents/bin/cmake/mac/share/cmake-3.14/Modules/CMakePackageConfigHelpers.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/CheckIncludeFile.cmake" - "/Applications/CLion.app/Contents/bin/cmake/mac/share/cmake-3.14/Modules/CheckLibraryExists.cmake" - "/Applications/CLion.app/Contents/bin/cmake/mac/share/cmake-3.14/Modules/CheckSymbolExists.cmake" - "/Applications/CLion.app/Contents/bin/cmake/mac/share/cmake-3.14/Modules/Compiler/AppleClang-C.cmake" - "/Applications/CLion.app/Contents/bin/cmake/mac/share/cmake-3.14/Modules/Compiler/AppleClang-CXX.cmake" - "/Applications/CLion.app/Contents/bin/cmake/mac/share/cmake-3.14/Modules/Compiler/CMakeCommonCompilerMacros.cmake" - "/Applications/CLion.app/Contents/bin/cmake/mac/share/cmake-3.14/Modules/Compiler/Clang.cmake" - "/Applications/CLion.app/Contents/bin/cmake/mac/share/cmake-3.14/Modules/Compiler/GNU.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/FindPythonInterp.cmake" - "/Applications/CLion.app/Contents/bin/cmake/mac/share/cmake-3.14/Modules/FindThreads.cmake" - "/Applications/CLion.app/Contents/bin/cmake/mac/share/cmake-3.14/Modules/GNUInstallDirs.cmake" - "/Applications/CLion.app/Contents/bin/cmake/mac/share/cmake-3.14/Modules/Internal/CMakeCheckCompilerFlag.cmake" - "/Applications/CLion.app/Contents/bin/cmake/mac/share/cmake-3.14/Modules/Platform/Apple-AppleClang-C.cmake" - "/Applications/CLion.app/Contents/bin/cmake/mac/share/cmake-3.14/Modules/Platform/Apple-AppleClang-CXX.cmake" - "/Applications/CLion.app/Contents/bin/cmake/mac/share/cmake-3.14/Modules/Platform/Apple-Clang-C.cmake" - "/Applications/CLion.app/Contents/bin/cmake/mac/share/cmake-3.14/Modules/Platform/Apple-Clang-CXX.cmake" - "/Applications/CLion.app/Contents/bin/cmake/mac/share/cmake-3.14/Modules/Platform/Apple-Clang.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/ProcessorCount.cmake" - "/Applications/CLion.app/Contents/bin/cmake/mac/share/cmake-3.14/Modules/WriteBasicConfigVersionFile.cmake" "../CMakeLists.txt" "../CMakeLists.txt.in" - "CMakeFiles/3.14.5/CMakeCCompiler.cmake" - "CMakeFiles/3.14.5/CMakeCXXCompiler.cmake" - "CMakeFiles/3.14.5/CMakeSystem.cmake" + "CMakeFiles/3.15.4/CMakeCCompiler.cmake" + "CMakeFiles/3.15.4/CMakeCXXCompiler.cmake" + "CMakeFiles/3.15.4/CMakeSystem.cmake" "googletest-src/CMakeLists.txt" "googletest-src/googlemock/CMakeLists.txt" "googletest-src/googlemock/cmake/gmock.pc.in" @@ -59,6 +21,44 @@ set(CMAKE_MAKEFILE_DEPENDS "googletest-src/googletest/cmake/gtest.pc.in" "googletest-src/googletest/cmake/gtest_main.pc.in" "googletest-src/googletest/cmake/internal_utils.cmake" + "/usr/local/Cellar/cmake/3.15.4/share/cmake/Modules/BasicConfigVersion-AnyNewerVersion.cmake.in" + "/usr/local/Cellar/cmake/3.15.4/share/cmake/Modules/CMakeCInformation.cmake" + "/usr/local/Cellar/cmake/3.15.4/share/cmake/Modules/CMakeCXXInformation.cmake" + "/usr/local/Cellar/cmake/3.15.4/share/cmake/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake" + "/usr/local/Cellar/cmake/3.15.4/share/cmake/Modules/CMakeCommonLanguageInclude.cmake" + "/usr/local/Cellar/cmake/3.15.4/share/cmake/Modules/CMakeDependentOption.cmake" + "/usr/local/Cellar/cmake/3.15.4/share/cmake/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake" + "/usr/local/Cellar/cmake/3.15.4/share/cmake/Modules/CMakeFindCodeBlocks.cmake" + "/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/CMakeLanguageInformation.cmake" + "/usr/local/Cellar/cmake/3.15.4/share/cmake/Modules/CMakePackageConfigHelpers.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/CheckCSourceCompiles.cmake" + "/usr/local/Cellar/cmake/3.15.4/share/cmake/Modules/CheckIncludeFile.cmake" + "/usr/local/Cellar/cmake/3.15.4/share/cmake/Modules/CheckLibraryExists.cmake" + "/usr/local/Cellar/cmake/3.15.4/share/cmake/Modules/Compiler/AppleClang-C.cmake" + "/usr/local/Cellar/cmake/3.15.4/share/cmake/Modules/Compiler/AppleClang-CXX.cmake" + "/usr/local/Cellar/cmake/3.15.4/share/cmake/Modules/Compiler/CMakeCommonCompilerMacros.cmake" + "/usr/local/Cellar/cmake/3.15.4/share/cmake/Modules/Compiler/Clang.cmake" + "/usr/local/Cellar/cmake/3.15.4/share/cmake/Modules/Compiler/GNU.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/FindPythonInterp.cmake" + "/usr/local/Cellar/cmake/3.15.4/share/cmake/Modules/FindThreads.cmake" + "/usr/local/Cellar/cmake/3.15.4/share/cmake/Modules/GNUInstallDirs.cmake" + "/usr/local/Cellar/cmake/3.15.4/share/cmake/Modules/Internal/CMakeCheckCompilerFlag.cmake" + "/usr/local/Cellar/cmake/3.15.4/share/cmake/Modules/Platform/Apple-AppleClang-C.cmake" + "/usr/local/Cellar/cmake/3.15.4/share/cmake/Modules/Platform/Apple-AppleClang-CXX.cmake" + "/usr/local/Cellar/cmake/3.15.4/share/cmake/Modules/Platform/Apple-Clang-C.cmake" + "/usr/local/Cellar/cmake/3.15.4/share/cmake/Modules/Platform/Apple-Clang-CXX.cmake" + "/usr/local/Cellar/cmake/3.15.4/share/cmake/Modules/Platform/Apple-Clang.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/ProcessorCount.cmake" + "/usr/local/Cellar/cmake/3.15.4/share/cmake/Modules/WriteBasicConfigVersionFile.cmake" ) # The corresponding makefile is: diff --git a/Hw7&8/cmake-build-debug/CMakeFiles/Makefile2 b/Hw7&8/cmake-build-debug/CMakeFiles/Makefile2 index ae8457f..9e73c9a 100644 --- a/Hw7&8/cmake-build-debug/CMakeFiles/Makefile2 +++ b/Hw7&8/cmake-build-debug/CMakeFiles/Makefile2 @@ -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,17 @@ CMAKE_SOURCE_DIR = "/Users/bradybodily/Repositories/CS3460/Hw7&8" # The top-level build directory on which CMake was run. CMAKE_BINARY_DIR = "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug" +#============================================================================= +# Directory level rules for the build root directory + +# The main recursive "clean" target. +clean: CMakeFiles/ClangFormat.dir/clean +clean: CMakeFiles/UnitTestRunner.dir/clean +clean: CMakeFiles/Weights.dir/clean +clean: googletest-build/clean + +.PHONY : clean + #============================================================================= # Target rules for target CMakeFiles/ClangFormat.dir @@ -91,11 +97,6 @@ CMakeFiles/ClangFormat.dir/clean: $(MAKE) -f CMakeFiles/ClangFormat.dir/build.make CMakeFiles/ClangFormat.dir/clean .PHONY : CMakeFiles/ClangFormat.dir/clean -# clean rule for target. -clean: CMakeFiles/ClangFormat.dir/clean - -.PHONY : clean - #============================================================================= # Target rules for target CMakeFiles/UnitTestRunner.dir @@ -129,11 +130,6 @@ CMakeFiles/UnitTestRunner.dir/clean: $(MAKE) -f CMakeFiles/UnitTestRunner.dir/build.make CMakeFiles/UnitTestRunner.dir/clean .PHONY : CMakeFiles/UnitTestRunner.dir/clean -# clean rule for target. -clean: CMakeFiles/UnitTestRunner.dir/clean - -.PHONY : clean - #============================================================================= # Target rules for target CMakeFiles/Weights.dir @@ -166,49 +162,46 @@ CMakeFiles/Weights.dir/clean: $(MAKE) -f CMakeFiles/Weights.dir/build.make CMakeFiles/Weights.dir/clean .PHONY : CMakeFiles/Weights.dir/clean -# clean rule for target. -clean: CMakeFiles/Weights.dir/clean - -.PHONY : clean - #============================================================================= # Directory level rules for directory googletest-build -# Convenience name for "all" pass in the directory. +# Recursive "all" directory target. googletest-build/all: googletest-build/googlemock/all .PHONY : googletest-build/all -# Convenience name for "clean" pass in the directory. -googletest-build/clean: googletest-build/googlemock/clean - -.PHONY : googletest-build/clean - -# Convenience name for "preinstall" pass in the directory. +# Recursive "preinstall" directory target. googletest-build/preinstall: googletest-build/googlemock/preinstall .PHONY : googletest-build/preinstall +# Recursive "clean" directory target. +googletest-build/clean: googletest-build/googlemock/clean + +.PHONY : googletest-build/clean + #============================================================================= # Directory level rules for directory googletest-build/googlemock -# Convenience name for "all" pass in the directory. +# Recursive "all" directory target. +googletest-build/googlemock/all: googletest-build/googlemock/CMakeFiles/gmock.dir/all +googletest-build/googlemock/all: googletest-build/googlemock/CMakeFiles/gmock_main.dir/all googletest-build/googlemock/all: googletest-build/googletest/all .PHONY : googletest-build/googlemock/all -# Convenience name for "clean" pass in the directory. +# Recursive "preinstall" directory target. +googletest-build/googlemock/preinstall: googletest-build/googletest/preinstall + +.PHONY : googletest-build/googlemock/preinstall + +# Recursive "clean" directory target. googletest-build/googlemock/clean: googletest-build/googlemock/CMakeFiles/gmock.dir/clean googletest-build/googlemock/clean: googletest-build/googlemock/CMakeFiles/gmock_main.dir/clean googletest-build/googlemock/clean: googletest-build/googletest/clean .PHONY : googletest-build/googlemock/clean -# Convenience name for "preinstall" pass in the directory. -googletest-build/googlemock/preinstall: googletest-build/googletest/preinstall - -.PHONY : googletest-build/googlemock/preinstall - #============================================================================= # Target rules for target googletest-build/googlemock/CMakeFiles/gmock.dir @@ -236,11 +229,6 @@ googletest-build/googlemock/CMakeFiles/gmock.dir/clean: $(MAKE) -f googletest-build/googlemock/CMakeFiles/gmock.dir/build.make googletest-build/googlemock/CMakeFiles/gmock.dir/clean .PHONY : googletest-build/googlemock/CMakeFiles/gmock.dir/clean -# clean rule for target. -clean: googletest-build/googlemock/CMakeFiles/gmock.dir/clean - -.PHONY : clean - #============================================================================= # Target rules for target googletest-build/googlemock/CMakeFiles/gmock_main.dir @@ -269,30 +257,26 @@ googletest-build/googlemock/CMakeFiles/gmock_main.dir/clean: $(MAKE) -f googletest-build/googlemock/CMakeFiles/gmock_main.dir/build.make googletest-build/googlemock/CMakeFiles/gmock_main.dir/clean .PHONY : googletest-build/googlemock/CMakeFiles/gmock_main.dir/clean -# clean rule for target. -clean: googletest-build/googlemock/CMakeFiles/gmock_main.dir/clean - -.PHONY : clean - #============================================================================= # Directory level rules for directory googletest-build/googletest -# Convenience name for "all" pass in the directory. -googletest-build/googletest/all: +# Recursive "all" directory target. +googletest-build/googletest/all: googletest-build/googletest/CMakeFiles/gtest_main.dir/all +googletest-build/googletest/all: googletest-build/googletest/CMakeFiles/gtest.dir/all .PHONY : googletest-build/googletest/all -# Convenience name for "clean" pass in the directory. +# Recursive "preinstall" directory target. +googletest-build/googletest/preinstall: + +.PHONY : googletest-build/googletest/preinstall + +# Recursive "clean" directory target. googletest-build/googletest/clean: googletest-build/googletest/CMakeFiles/gtest_main.dir/clean googletest-build/googletest/clean: googletest-build/googletest/CMakeFiles/gtest.dir/clean .PHONY : googletest-build/googletest/clean -# Convenience name for "preinstall" pass in the directory. -googletest-build/googletest/preinstall: - -.PHONY : googletest-build/googletest/preinstall - #============================================================================= # Target rules for target googletest-build/googletest/CMakeFiles/gtest_main.dir @@ -320,11 +304,6 @@ googletest-build/googletest/CMakeFiles/gtest_main.dir/clean: $(MAKE) -f googletest-build/googletest/CMakeFiles/gtest_main.dir/build.make googletest-build/googletest/CMakeFiles/gtest_main.dir/clean .PHONY : googletest-build/googletest/CMakeFiles/gtest_main.dir/clean -# clean rule for target. -clean: googletest-build/googletest/CMakeFiles/gtest_main.dir/clean - -.PHONY : clean - #============================================================================= # Target rules for target googletest-build/googletest/CMakeFiles/gtest.dir @@ -352,11 +331,6 @@ googletest-build/googletest/CMakeFiles/gtest.dir/clean: $(MAKE) -f googletest-build/googletest/CMakeFiles/gtest.dir/build.make googletest-build/googletest/CMakeFiles/gtest.dir/clean .PHONY : googletest-build/googletest/CMakeFiles/gtest.dir/clean -# clean rule for target. -clean: googletest-build/googletest/CMakeFiles/gtest.dir/clean - -.PHONY : clean - #============================================================================= # Special targets to cleanup operation of make. diff --git a/Hw7&8/cmake-build-debug/CMakeFiles/UnitTestRunner.dir/build.make b/Hw7&8/cmake-build-debug/CMakeFiles/UnitTestRunner.dir/build.make index 3b68845..1ea1dcf 100644 --- a/Hw7&8/cmake-build-debug/CMakeFiles/UnitTestRunner.dir/build.make +++ b/Hw7&8/cmake-build-debug/CMakeFiles/UnitTestRunner.dir/build.make @@ -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 = = diff --git a/Hw7&8/cmake-build-debug/CMakeFiles/UnitTestRunner.dir/cmake_clean.cmake b/Hw7&8/cmake-build-debug/CMakeFiles/UnitTestRunner.dir/cmake_clean.cmake index 951a476..23e2878 100644 --- a/Hw7&8/cmake-build-debug/CMakeFiles/UnitTestRunner.dir/cmake_clean.cmake +++ b/Hw7&8/cmake-build-debug/CMakeFiles/UnitTestRunner.dir/cmake_clean.cmake @@ -1,7 +1,7 @@ file(REMOVE_RECURSE "CMakeFiles/UnitTestRunner.dir/weight.cpp.o" - "UnitTestRunner.pdb" "UnitTestRunner" + "UnitTestRunner.pdb" ) # Per-language clean rules from dependency scanning. diff --git a/Hw7&8/cmake-build-debug/CMakeFiles/UnitTestRunner.dir/depend.internal b/Hw7&8/cmake-build-debug/CMakeFiles/UnitTestRunner.dir/depend.internal index 05f052a..ef3c677 100644 --- a/Hw7&8/cmake-build-debug/CMakeFiles/UnitTestRunner.dir/depend.internal +++ b/Hw7&8/cmake-build-debug/CMakeFiles/UnitTestRunner.dir/depend.internal @@ -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 CMakeFiles/UnitTestRunner.dir/weight.cpp.o /Users/bradybodily/Repositories/CS3460/Hw7&8/weight.cpp diff --git a/Hw7&8/cmake-build-debug/CMakeFiles/UnitTestRunner.dir/depend.make b/Hw7&8/cmake-build-debug/CMakeFiles/UnitTestRunner.dir/depend.make index ce23b91..8641f7a 100644 --- a/Hw7&8/cmake-build-debug/CMakeFiles/UnitTestRunner.dir/depend.make +++ b/Hw7&8/cmake-build-debug/CMakeFiles/UnitTestRunner.dir/depend.make @@ -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 CMakeFiles/UnitTestRunner.dir/weight.cpp.o: ../weight.cpp CMakeFiles/UnitTestRunner.dir/weight.cpp.o: ../weight.hpp diff --git a/Hw7&8/cmake-build-debug/CMakeFiles/UnitTestRunner.dir/flags.make b/Hw7&8/cmake-build-debug/CMakeFiles/UnitTestRunner.dir/flags.make index 20a1a74..e8a5a61 100644 --- a/Hw7&8/cmake-build-debug/CMakeFiles/UnitTestRunner.dir/flags.make +++ b/Hw7&8/cmake-build-debug/CMakeFiles/UnitTestRunner.dir/flags.make @@ -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 # compile CXX with /Library/Developer/CommandLineTools/usr/bin/c++ CXX_FLAGS = -g -isysroot /Library/Developer/CommandLineTools/SDKs/MacOSX10.15.sdk -std=gnu++1z diff --git a/Hw7&8/cmake-build-debug/CMakeFiles/Weights.dir/build.make b/Hw7&8/cmake-build-debug/CMakeFiles/Weights.dir/build.make index ac85f62..0c296bc 100644 --- a/Hw7&8/cmake-build-debug/CMakeFiles/Weights.dir/build.make +++ b/Hw7&8/cmake-build-debug/CMakeFiles/Weights.dir/build.make @@ -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 = = diff --git a/Hw7&8/cmake-build-debug/CMakeFiles/Weights.dir/cmake_clean.cmake b/Hw7&8/cmake-build-debug/CMakeFiles/Weights.dir/cmake_clean.cmake index f403f46..80740cd 100644 --- a/Hw7&8/cmake-build-debug/CMakeFiles/Weights.dir/cmake_clean.cmake +++ b/Hw7&8/cmake-build-debug/CMakeFiles/Weights.dir/cmake_clean.cmake @@ -1,7 +1,7 @@ file(REMOVE_RECURSE "CMakeFiles/Weights.dir/main.cpp.o" - "Weights.pdb" "Weights" + "Weights.pdb" ) # Per-language clean rules from dependency scanning. diff --git a/Hw7&8/cmake-build-debug/CMakeFiles/Weights.dir/depend.internal b/Hw7&8/cmake-build-debug/CMakeFiles/Weights.dir/depend.internal index 105217f..3cafe6a 100644 --- a/Hw7&8/cmake-build-debug/CMakeFiles/Weights.dir/depend.internal +++ b/Hw7&8/cmake-build-debug/CMakeFiles/Weights.dir/depend.internal @@ -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 CMakeFiles/Weights.dir/main.cpp.o /Users/bradybodily/Repositories/CS3460/Hw7&8/main.cpp diff --git a/Hw7&8/cmake-build-debug/CMakeFiles/Weights.dir/depend.make b/Hw7&8/cmake-build-debug/CMakeFiles/Weights.dir/depend.make index e33ee48..81fe7a7 100644 --- a/Hw7&8/cmake-build-debug/CMakeFiles/Weights.dir/depend.make +++ b/Hw7&8/cmake-build-debug/CMakeFiles/Weights.dir/depend.make @@ -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 CMakeFiles/Weights.dir/main.cpp.o: ../main.cpp CMakeFiles/Weights.dir/main.cpp.o: ../weight.hpp diff --git a/Hw7&8/cmake-build-debug/CMakeFiles/Weights.dir/flags.make b/Hw7&8/cmake-build-debug/CMakeFiles/Weights.dir/flags.make index 53cc6e0..1d44885 100644 --- a/Hw7&8/cmake-build-debug/CMakeFiles/Weights.dir/flags.make +++ b/Hw7&8/cmake-build-debug/CMakeFiles/Weights.dir/flags.make @@ -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 # compile CXX with /Library/Developer/CommandLineTools/usr/bin/c++ CXX_FLAGS = -g -isysroot /Library/Developer/CommandLineTools/SDKs/MacOSX10.15.sdk -std=gnu++1z diff --git a/Hw7&8/cmake-build-debug/CMakeFiles/Weights.dir/main.cpp.o b/Hw7&8/cmake-build-debug/CMakeFiles/Weights.dir/main.cpp.o index 140ef3d..262e4f5 100644 Binary files a/Hw7&8/cmake-build-debug/CMakeFiles/Weights.dir/main.cpp.o and b/Hw7&8/cmake-build-debug/CMakeFiles/Weights.dir/main.cpp.o differ diff --git a/Hw7&8/cmake-build-debug/Makefile b/Hw7&8/cmake-build-debug/Makefile index b3176d4..2c87554 100644 --- a/Hw7&8/cmake-build-debug/Makefile +++ b/Hw7&8/cmake-build-debug/Makefile @@ -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,37 +59,37 @@ CMAKE_BINARY_DIR = "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-deb # Special rule for the target install/local install/local: preinstall @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..." - /Applications/CLion.app/Contents/bin/cmake/mac/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake + /usr/local/Cellar/cmake/3.15.4/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake .PHONY : install/local # Special rule for the target install/local install/local/fast: preinstall/fast @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..." - /Applications/CLion.app/Contents/bin/cmake/mac/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake + /usr/local/Cellar/cmake/3.15.4/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake .PHONY : install/local/fast # Special rule for the target install/strip install/strip: preinstall @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..." - /Applications/CLion.app/Contents/bin/cmake/mac/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake + /usr/local/Cellar/cmake/3.15.4/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake .PHONY : install/strip # Special rule for the target install/strip install/strip/fast: preinstall/fast @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..." - /Applications/CLion.app/Contents/bin/cmake/mac/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake + /usr/local/Cellar/cmake/3.15.4/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake .PHONY : install/strip/fast # Special rule for the target install install: preinstall @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..." - /Applications/CLion.app/Contents/bin/cmake/mac/bin/cmake -P cmake_install.cmake + /usr/local/Cellar/cmake/3.15.4/bin/cmake -P cmake_install.cmake .PHONY : install # Special rule for the target install install/fast: preinstall/fast @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..." - /Applications/CLion.app/Contents/bin/cmake/mac/bin/cmake -P cmake_install.cmake + /usr/local/Cellar/cmake/3.15.4/bin/cmake -P cmake_install.cmake .PHONY : install/fast # Special rule for the target list_install_components @@ -105,7 +105,7 @@ list_install_components/fast: list_install_components # 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 @@ -116,7 +116,7 @@ rebuild_cache/fast: rebuild_cache # Special rule for the target edit_cache edit_cache: @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "No interactive CMake dialog available..." - /Applications/CLion.app/Contents/bin/cmake/mac/bin/cmake -E echo No\ interactive\ CMake\ dialog\ available. + /usr/local/Cellar/cmake/3.15.4/bin/cmake -E echo No\ interactive\ CMake\ dialog\ available. .PHONY : edit_cache # Special rule for the target edit_cache diff --git a/Hw7&8/cmake-build-debug/UnitTestRunner b/Hw7&8/cmake-build-debug/UnitTestRunner index f8bca75..219bac8 100755 Binary files a/Hw7&8/cmake-build-debug/UnitTestRunner and b/Hw7&8/cmake-build-debug/UnitTestRunner differ diff --git a/Hw7&8/cmake-build-debug/Weights b/Hw7&8/cmake-build-debug/Weights index 96ff993..1bef8b4 100755 Binary files a/Hw7&8/cmake-build-debug/Weights and b/Hw7&8/cmake-build-debug/Weights differ diff --git a/Hw7&8/cmake-build-debug/googletest-build/CMakeFiles/CMakeDirectoryInformation.cmake b/Hw7&8/cmake-build-debug/googletest-build/CMakeFiles/CMakeDirectoryInformation.cmake index 6506fd5..4b8dd6c 100644 --- a/Hw7&8/cmake-build-debug/googletest-build/CMakeFiles/CMakeDirectoryInformation.cmake +++ b/Hw7&8/cmake-build-debug/googletest-build/CMakeFiles/CMakeDirectoryInformation.cmake @@ -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") diff --git a/Hw7&8/cmake-build-debug/googletest-build/CMakeFiles/progress.marks b/Hw7&8/cmake-build-debug/googletest-build/CMakeFiles/progress.marks index 573541a..45a4fb7 100644 --- a/Hw7&8/cmake-build-debug/googletest-build/CMakeFiles/progress.marks +++ b/Hw7&8/cmake-build-debug/googletest-build/CMakeFiles/progress.marks @@ -1 +1 @@ -0 +8 diff --git a/Hw7&8/cmake-build-debug/googletest-build/Makefile b/Hw7&8/cmake-build-debug/googletest-build/Makefile index f6cb202..d9afd42 100644 --- a/Hw7&8/cmake-build-debug/googletest-build/Makefile +++ b/Hw7&8/cmake-build-debug/googletest-build/Makefile @@ -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,37 +59,37 @@ CMAKE_BINARY_DIR = "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-deb # Special rule for the target install/local install/local: preinstall @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..." - /Applications/CLion.app/Contents/bin/cmake/mac/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake + /usr/local/Cellar/cmake/3.15.4/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake .PHONY : install/local # Special rule for the target install/local install/local/fast: preinstall/fast @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..." - /Applications/CLion.app/Contents/bin/cmake/mac/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake + /usr/local/Cellar/cmake/3.15.4/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake .PHONY : install/local/fast # Special rule for the target install/strip install/strip: preinstall @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..." - /Applications/CLion.app/Contents/bin/cmake/mac/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake + /usr/local/Cellar/cmake/3.15.4/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake .PHONY : install/strip # Special rule for the target install/strip install/strip/fast: preinstall/fast @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..." - /Applications/CLion.app/Contents/bin/cmake/mac/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake + /usr/local/Cellar/cmake/3.15.4/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake .PHONY : install/strip/fast # Special rule for the target install install: preinstall @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..." - /Applications/CLion.app/Contents/bin/cmake/mac/bin/cmake -P cmake_install.cmake + /usr/local/Cellar/cmake/3.15.4/bin/cmake -P cmake_install.cmake .PHONY : install # Special rule for the target install install/fast: preinstall/fast @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..." - /Applications/CLion.app/Contents/bin/cmake/mac/bin/cmake -P cmake_install.cmake + /usr/local/Cellar/cmake/3.15.4/bin/cmake -P cmake_install.cmake .PHONY : install/fast # Special rule for the target list_install_components @@ -105,7 +105,7 @@ list_install_components/fast: list_install_components # 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 @@ -116,7 +116,7 @@ rebuild_cache/fast: rebuild_cache # Special rule for the target edit_cache edit_cache: @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "No interactive CMake dialog available..." - /Applications/CLion.app/Contents/bin/cmake/mac/bin/cmake -E echo No\ interactive\ CMake\ dialog\ available. + /usr/local/Cellar/cmake/3.15.4/bin/cmake -E echo No\ interactive\ CMake\ dialog\ available. .PHONY : edit_cache # Special rule for the target edit_cache diff --git a/Hw7&8/cmake-build-debug/googletest-build/cmake_install.cmake b/Hw7&8/cmake-build-debug/googletest-build/cmake_install.cmake index 41b883e..168576d 100644 --- a/Hw7&8/cmake-build-debug/googletest-build/cmake_install.cmake +++ b/Hw7&8/cmake-build-debug/googletest-build/cmake_install.cmake @@ -34,6 +34,7 @@ endif() if(NOT CMAKE_INSTALL_LOCAL_ONLY) # Include the install script for each subdirectory. + include("/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-build/googlemock/cmake_install.cmake") endif() diff --git a/Hw7&8/cmake-build-debug/googletest-build/googlemock/CMakeFiles/CMakeDirectoryInformation.cmake b/Hw7&8/cmake-build-debug/googletest-build/googlemock/CMakeFiles/CMakeDirectoryInformation.cmake index 6506fd5..4b8dd6c 100644 --- a/Hw7&8/cmake-build-debug/googletest-build/googlemock/CMakeFiles/CMakeDirectoryInformation.cmake +++ b/Hw7&8/cmake-build-debug/googletest-build/googlemock/CMakeFiles/CMakeDirectoryInformation.cmake @@ -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") diff --git a/Hw7&8/cmake-build-debug/googletest-build/googlemock/CMakeFiles/gmock.dir/build.make b/Hw7&8/cmake-build-debug/googletest-build/googlemock/CMakeFiles/gmock.dir/build.make index 9bcce7a..45a577c 100644 --- a/Hw7&8/cmake-build-debug/googletest-build/googlemock/CMakeFiles/gmock.dir/build.make +++ b/Hw7&8/cmake-build-debug/googletest-build/googlemock/CMakeFiles/gmock.dir/build.make @@ -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 = = diff --git a/Hw7&8/cmake-build-debug/googletest-build/googlemock/CMakeFiles/gmock.dir/cmake_clean.cmake b/Hw7&8/cmake-build-debug/googletest-build/googlemock/CMakeFiles/gmock.dir/cmake_clean.cmake index 3c77276..89a7556 100644 --- a/Hw7&8/cmake-build-debug/googletest-build/googlemock/CMakeFiles/gmock.dir/cmake_clean.cmake +++ b/Hw7&8/cmake-build-debug/googletest-build/googlemock/CMakeFiles/gmock.dir/cmake_clean.cmake @@ -1,7 +1,7 @@ file(REMOVE_RECURSE - "CMakeFiles/gmock.dir/src/gmock-all.cc.o" "../../bin/libgmockd.pdb" "../../lib/libgmockd.a" + "CMakeFiles/gmock.dir/src/gmock-all.cc.o" ) # Per-language clean rules from dependency scanning. diff --git a/Hw7&8/cmake-build-debug/googletest-build/googlemock/CMakeFiles/gmock.dir/flags.make b/Hw7&8/cmake-build-debug/googletest-build/googlemock/CMakeFiles/gmock.dir/flags.make index fb97bec..2c8adcc 100644 --- a/Hw7&8/cmake-build-debug/googletest-build/googlemock/CMakeFiles/gmock.dir/flags.make +++ b/Hw7&8/cmake-build-debug/googletest-build/googlemock/CMakeFiles/gmock.dir/flags.make @@ -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 # compile CXX with /Library/Developer/CommandLineTools/usr/bin/c++ CXX_FLAGS = -g -isysroot /Library/Developer/CommandLineTools/SDKs/MacOSX10.15.sdk -Wall -Wshadow -Werror -Wconversion -DGTEST_HAS_PTHREAD=1 -fexceptions -W -Wpointer-arith -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch -Wunused-parameter -Wcast-align -Wchar-subscripts -Winline -Wredundant-decls -std=c++11 diff --git a/Hw7&8/cmake-build-debug/googletest-build/googlemock/CMakeFiles/gmock_main.dir/build.make b/Hw7&8/cmake-build-debug/googletest-build/googlemock/CMakeFiles/gmock_main.dir/build.make index 951a7d2..98674a0 100644 --- a/Hw7&8/cmake-build-debug/googletest-build/googlemock/CMakeFiles/gmock_main.dir/build.make +++ b/Hw7&8/cmake-build-debug/googletest-build/googlemock/CMakeFiles/gmock_main.dir/build.make @@ -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 = = diff --git a/Hw7&8/cmake-build-debug/googletest-build/googlemock/CMakeFiles/gmock_main.dir/cmake_clean.cmake b/Hw7&8/cmake-build-debug/googletest-build/googlemock/CMakeFiles/gmock_main.dir/cmake_clean.cmake index e088d90..9d96206 100644 --- a/Hw7&8/cmake-build-debug/googletest-build/googlemock/CMakeFiles/gmock_main.dir/cmake_clean.cmake +++ b/Hw7&8/cmake-build-debug/googletest-build/googlemock/CMakeFiles/gmock_main.dir/cmake_clean.cmake @@ -1,7 +1,7 @@ file(REMOVE_RECURSE - "CMakeFiles/gmock_main.dir/src/gmock_main.cc.o" "../../bin/libgmock_maind.pdb" "../../lib/libgmock_maind.a" + "CMakeFiles/gmock_main.dir/src/gmock_main.cc.o" ) # Per-language clean rules from dependency scanning. diff --git a/Hw7&8/cmake-build-debug/googletest-build/googlemock/CMakeFiles/gmock_main.dir/flags.make b/Hw7&8/cmake-build-debug/googletest-build/googlemock/CMakeFiles/gmock_main.dir/flags.make index 362518b..3b5e200 100644 --- a/Hw7&8/cmake-build-debug/googletest-build/googlemock/CMakeFiles/gmock_main.dir/flags.make +++ b/Hw7&8/cmake-build-debug/googletest-build/googlemock/CMakeFiles/gmock_main.dir/flags.make @@ -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 # compile CXX with /Library/Developer/CommandLineTools/usr/bin/c++ CXX_FLAGS = -g -isysroot /Library/Developer/CommandLineTools/SDKs/MacOSX10.15.sdk -Wall -Wshadow -Werror -Wconversion -DGTEST_HAS_PTHREAD=1 -fexceptions -W -Wpointer-arith -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch -Wunused-parameter -Wcast-align -Wchar-subscripts -Winline -Wredundant-decls -std=c++11 diff --git a/Hw7&8/cmake-build-debug/googletest-build/googlemock/CMakeFiles/progress.marks b/Hw7&8/cmake-build-debug/googletest-build/googlemock/CMakeFiles/progress.marks index 573541a..45a4fb7 100644 --- a/Hw7&8/cmake-build-debug/googletest-build/googlemock/CMakeFiles/progress.marks +++ b/Hw7&8/cmake-build-debug/googletest-build/googlemock/CMakeFiles/progress.marks @@ -1 +1 @@ -0 +8 diff --git a/Hw7&8/cmake-build-debug/googletest-build/googlemock/Makefile b/Hw7&8/cmake-build-debug/googletest-build/googlemock/Makefile index 27515d9..fadec16 100644 --- a/Hw7&8/cmake-build-debug/googletest-build/googlemock/Makefile +++ b/Hw7&8/cmake-build-debug/googletest-build/googlemock/Makefile @@ -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,43 +59,43 @@ CMAKE_BINARY_DIR = "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-deb # Special rule for the target install/local install/local: preinstall @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..." - /Applications/CLion.app/Contents/bin/cmake/mac/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake + /usr/local/Cellar/cmake/3.15.4/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake .PHONY : install/local # Special rule for the target install/local install/local/fast: preinstall/fast @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..." - /Applications/CLion.app/Contents/bin/cmake/mac/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake + /usr/local/Cellar/cmake/3.15.4/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake .PHONY : install/local/fast # Special rule for the target install/strip install/strip: preinstall @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..." - /Applications/CLion.app/Contents/bin/cmake/mac/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake + /usr/local/Cellar/cmake/3.15.4/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake .PHONY : install/strip # Special rule for the target install/strip install/strip/fast: preinstall/fast @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..." - /Applications/CLion.app/Contents/bin/cmake/mac/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake + /usr/local/Cellar/cmake/3.15.4/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake .PHONY : install/strip/fast # Special rule for the target install install: preinstall @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..." - /Applications/CLion.app/Contents/bin/cmake/mac/bin/cmake -P cmake_install.cmake + /usr/local/Cellar/cmake/3.15.4/bin/cmake -P cmake_install.cmake .PHONY : install # Special rule for the target install install/fast: preinstall/fast @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..." - /Applications/CLion.app/Contents/bin/cmake/mac/bin/cmake -P cmake_install.cmake + /usr/local/Cellar/cmake/3.15.4/bin/cmake -P cmake_install.cmake .PHONY : install/fast # 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 @@ -106,7 +106,7 @@ rebuild_cache/fast: rebuild_cache # Special rule for the target edit_cache edit_cache: @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "No interactive CMake dialog available..." - /Applications/CLion.app/Contents/bin/cmake/mac/bin/cmake -E echo No\ interactive\ CMake\ dialog\ available. + /usr/local/Cellar/cmake/3.15.4/bin/cmake -E echo No\ interactive\ CMake\ dialog\ available. .PHONY : edit_cache # Special rule for the target edit_cache diff --git a/Hw7&8/cmake-build-debug/googletest-build/googlemock/cmake_install.cmake b/Hw7&8/cmake-build-debug/googletest-build/googlemock/cmake_install.cmake index d35cd63..c2e0128 100644 --- a/Hw7&8/cmake-build-debug/googletest-build/googlemock/cmake_install.cmake +++ b/Hw7&8/cmake-build-debug/googletest-build/googlemock/cmake_install.cmake @@ -62,6 +62,7 @@ endif() if(NOT CMAKE_INSTALL_LOCAL_ONLY) # Include the install script for each subdirectory. + include("/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-build/googletest/cmake_install.cmake") endif() diff --git a/Hw7&8/cmake-build-debug/googletest-build/googletest/CMakeFiles/CMakeDirectoryInformation.cmake b/Hw7&8/cmake-build-debug/googletest-build/googletest/CMakeFiles/CMakeDirectoryInformation.cmake index 6506fd5..4b8dd6c 100644 --- a/Hw7&8/cmake-build-debug/googletest-build/googletest/CMakeFiles/CMakeDirectoryInformation.cmake +++ b/Hw7&8/cmake-build-debug/googletest-build/googletest/CMakeFiles/CMakeDirectoryInformation.cmake @@ -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") diff --git a/Hw7&8/cmake-build-debug/googletest-build/googletest/CMakeFiles/gtest.dir/build.make b/Hw7&8/cmake-build-debug/googletest-build/googletest/CMakeFiles/gtest.dir/build.make index 01ed4f2..7033992 100644 --- a/Hw7&8/cmake-build-debug/googletest-build/googletest/CMakeFiles/gtest.dir/build.make +++ b/Hw7&8/cmake-build-debug/googletest-build/googletest/CMakeFiles/gtest.dir/build.make @@ -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 = = diff --git a/Hw7&8/cmake-build-debug/googletest-build/googletest/CMakeFiles/gtest.dir/cmake_clean.cmake b/Hw7&8/cmake-build-debug/googletest-build/googletest/CMakeFiles/gtest.dir/cmake_clean.cmake index 4655e31..fe2ef2d 100644 --- a/Hw7&8/cmake-build-debug/googletest-build/googletest/CMakeFiles/gtest.dir/cmake_clean.cmake +++ b/Hw7&8/cmake-build-debug/googletest-build/googletest/CMakeFiles/gtest.dir/cmake_clean.cmake @@ -1,7 +1,7 @@ file(REMOVE_RECURSE - "CMakeFiles/gtest.dir/src/gtest-all.cc.o" "../../bin/libgtestd.pdb" "../../lib/libgtestd.a" + "CMakeFiles/gtest.dir/src/gtest-all.cc.o" ) # Per-language clean rules from dependency scanning. diff --git a/Hw7&8/cmake-build-debug/googletest-build/googletest/CMakeFiles/gtest.dir/depend.internal b/Hw7&8/cmake-build-debug/googletest-build/googletest/CMakeFiles/gtest.dir/depend.internal index 0e0e430..fc9f55b 100644 --- a/Hw7&8/cmake-build-debug/googletest-build/googletest/CMakeFiles/gtest.dir/depend.internal +++ b/Hw7&8/cmake-build-debug/googletest-build/googletest/CMakeFiles/gtest.dir/depend.internal @@ -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 googletest-build/googletest/CMakeFiles/gtest.dir/src/gtest-all.cc.o /Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-src/googletest/src/gtest-all.cc diff --git a/Hw7&8/cmake-build-debug/googletest-build/googletest/CMakeFiles/gtest.dir/depend.make b/Hw7&8/cmake-build-debug/googletest-build/googletest/CMakeFiles/gtest.dir/depend.make index 65fe867..89db633 100644 --- a/Hw7&8/cmake-build-debug/googletest-build/googletest/CMakeFiles/gtest.dir/depend.make +++ b/Hw7&8/cmake-build-debug/googletest-build/googletest/CMakeFiles/gtest.dir/depend.make @@ -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 googletest-build/googletest/CMakeFiles/gtest.dir/src/gtest-all.cc.o: googletest-src/googletest/src/gtest-all.cc googletest-build/googletest/CMakeFiles/gtest.dir/src/gtest-all.cc.o: googletest-src/googletest/include/gtest/gtest-death-test.h diff --git a/Hw7&8/cmake-build-debug/googletest-build/googletest/CMakeFiles/gtest.dir/flags.make b/Hw7&8/cmake-build-debug/googletest-build/googletest/CMakeFiles/gtest.dir/flags.make index 989f959..2becd0c 100644 --- a/Hw7&8/cmake-build-debug/googletest-build/googletest/CMakeFiles/gtest.dir/flags.make +++ b/Hw7&8/cmake-build-debug/googletest-build/googletest/CMakeFiles/gtest.dir/flags.make @@ -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 # compile CXX with /Library/Developer/CommandLineTools/usr/bin/c++ CXX_FLAGS = -g -isysroot /Library/Developer/CommandLineTools/SDKs/MacOSX10.15.sdk -Wall -Wshadow -Werror -Wconversion -DGTEST_HAS_PTHREAD=1 -fexceptions -W -Wpointer-arith -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch -Wunused-parameter -Wcast-align -Wchar-subscripts -Winline -Wredundant-decls -std=c++11 diff --git a/Hw7&8/cmake-build-debug/googletest-build/googletest/CMakeFiles/gtest_main.dir/build.make b/Hw7&8/cmake-build-debug/googletest-build/googletest/CMakeFiles/gtest_main.dir/build.make index 1d1e8ce..ba68268 100644 --- a/Hw7&8/cmake-build-debug/googletest-build/googletest/CMakeFiles/gtest_main.dir/build.make +++ b/Hw7&8/cmake-build-debug/googletest-build/googletest/CMakeFiles/gtest_main.dir/build.make @@ -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 = = diff --git a/Hw7&8/cmake-build-debug/googletest-build/googletest/CMakeFiles/gtest_main.dir/cmake_clean.cmake b/Hw7&8/cmake-build-debug/googletest-build/googletest/CMakeFiles/gtest_main.dir/cmake_clean.cmake index 7be3658..f3d1746 100644 --- a/Hw7&8/cmake-build-debug/googletest-build/googletest/CMakeFiles/gtest_main.dir/cmake_clean.cmake +++ b/Hw7&8/cmake-build-debug/googletest-build/googletest/CMakeFiles/gtest_main.dir/cmake_clean.cmake @@ -1,7 +1,7 @@ file(REMOVE_RECURSE - "CMakeFiles/gtest_main.dir/src/gtest_main.cc.o" "../../bin/libgtest_maind.pdb" "../../lib/libgtest_maind.a" + "CMakeFiles/gtest_main.dir/src/gtest_main.cc.o" ) # Per-language clean rules from dependency scanning. diff --git a/Hw7&8/cmake-build-debug/googletest-build/googletest/CMakeFiles/gtest_main.dir/depend.internal b/Hw7&8/cmake-build-debug/googletest-build/googletest/CMakeFiles/gtest_main.dir/depend.internal index 9c3f18b..f283378 100644 --- a/Hw7&8/cmake-build-debug/googletest-build/googletest/CMakeFiles/gtest_main.dir/depend.internal +++ b/Hw7&8/cmake-build-debug/googletest-build/googletest/CMakeFiles/gtest_main.dir/depend.internal @@ -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 googletest-build/googletest/CMakeFiles/gtest_main.dir/src/gtest_main.cc.o /Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-debug/googletest-src/googletest/src/gtest_main.cc diff --git a/Hw7&8/cmake-build-debug/googletest-build/googletest/CMakeFiles/gtest_main.dir/depend.make b/Hw7&8/cmake-build-debug/googletest-build/googletest/CMakeFiles/gtest_main.dir/depend.make index 25631d2..f7ae6eb 100644 --- a/Hw7&8/cmake-build-debug/googletest-build/googletest/CMakeFiles/gtest_main.dir/depend.make +++ b/Hw7&8/cmake-build-debug/googletest-build/googletest/CMakeFiles/gtest_main.dir/depend.make @@ -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 googletest-build/googletest/CMakeFiles/gtest_main.dir/src/gtest_main.cc.o: googletest-src/googletest/src/gtest_main.cc googletest-build/googletest/CMakeFiles/gtest_main.dir/src/gtest_main.cc.o: googletest-src/googletest/include/gtest/gtest-death-test.h diff --git a/Hw7&8/cmake-build-debug/googletest-build/googletest/CMakeFiles/gtest_main.dir/flags.make b/Hw7&8/cmake-build-debug/googletest-build/googletest/CMakeFiles/gtest_main.dir/flags.make index dbc8f11..2f484a2 100644 --- a/Hw7&8/cmake-build-debug/googletest-build/googletest/CMakeFiles/gtest_main.dir/flags.make +++ b/Hw7&8/cmake-build-debug/googletest-build/googletest/CMakeFiles/gtest_main.dir/flags.make @@ -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 # compile CXX with /Library/Developer/CommandLineTools/usr/bin/c++ CXX_FLAGS = -g -isysroot /Library/Developer/CommandLineTools/SDKs/MacOSX10.15.sdk -Wall -Wshadow -Werror -Wconversion -DGTEST_HAS_PTHREAD=1 -fexceptions -W -Wpointer-arith -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch -Wunused-parameter -Wcast-align -Wchar-subscripts -Winline -Wredundant-decls -std=c++11 diff --git a/Hw7&8/cmake-build-debug/googletest-build/googletest/CMakeFiles/progress.marks b/Hw7&8/cmake-build-debug/googletest-build/googletest/CMakeFiles/progress.marks index 573541a..b8626c4 100644 --- a/Hw7&8/cmake-build-debug/googletest-build/googletest/CMakeFiles/progress.marks +++ b/Hw7&8/cmake-build-debug/googletest-build/googletest/CMakeFiles/progress.marks @@ -1 +1 @@ -0 +4 diff --git a/Hw7&8/cmake-build-debug/googletest-build/googletest/Makefile b/Hw7&8/cmake-build-debug/googletest-build/googletest/Makefile index 8ac58fd..3861ced 100644 --- a/Hw7&8/cmake-build-debug/googletest-build/googletest/Makefile +++ b/Hw7&8/cmake-build-debug/googletest-build/googletest/Makefile @@ -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,13 +59,13 @@ CMAKE_BINARY_DIR = "/Users/bradybodily/Repositories/CS3460/Hw7&8/cmake-build-deb # Special rule for the target install/local install/local: preinstall @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..." - /Applications/CLion.app/Contents/bin/cmake/mac/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake + /usr/local/Cellar/cmake/3.15.4/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake .PHONY : install/local # Special rule for the target install/local install/local/fast: preinstall/fast @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..." - /Applications/CLion.app/Contents/bin/cmake/mac/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake + /usr/local/Cellar/cmake/3.15.4/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake .PHONY : install/local/fast # Special rule for the target list_install_components @@ -81,7 +81,7 @@ list_install_components/fast: list_install_components # 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 @@ -92,7 +92,7 @@ rebuild_cache/fast: rebuild_cache # Special rule for the target edit_cache edit_cache: @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "No interactive CMake dialog available..." - /Applications/CLion.app/Contents/bin/cmake/mac/bin/cmake -E echo No\ interactive\ CMake\ dialog\ available. + /usr/local/Cellar/cmake/3.15.4/bin/cmake -E echo No\ interactive\ CMake\ dialog\ available. .PHONY : edit_cache # Special rule for the target edit_cache @@ -103,25 +103,25 @@ edit_cache/fast: edit_cache # Special rule for the target install/strip install/strip: preinstall @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..." - /Applications/CLion.app/Contents/bin/cmake/mac/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake + /usr/local/Cellar/cmake/3.15.4/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake .PHONY : install/strip # Special rule for the target install/strip install/strip/fast: preinstall/fast @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..." - /Applications/CLion.app/Contents/bin/cmake/mac/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake + /usr/local/Cellar/cmake/3.15.4/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake .PHONY : install/strip/fast # Special rule for the target install install: preinstall @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..." - /Applications/CLion.app/Contents/bin/cmake/mac/bin/cmake -P cmake_install.cmake + /usr/local/Cellar/cmake/3.15.4/bin/cmake -P cmake_install.cmake .PHONY : install # Special rule for the target install install/fast: preinstall/fast @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..." - /Applications/CLion.app/Contents/bin/cmake/mac/bin/cmake -P cmake_install.cmake + /usr/local/Cellar/cmake/3.15.4/bin/cmake -P cmake_install.cmake .PHONY : install/fast # The main all target diff --git a/Hw7&8/cmake-build-debug/googletest-build/googletest/generated/GTestConfigVersion.cmake b/Hw7&8/cmake-build-debug/googletest-build/googletest/generated/GTestConfigVersion.cmake index 90e89ef..fb8e2b9 100644 --- a/Hw7&8/cmake-build-debug/googletest-build/googletest/generated/GTestConfigVersion.cmake +++ b/Hw7&8/cmake-build-debug/googletest-build/googletest/generated/GTestConfigVersion.cmake @@ -26,12 +26,12 @@ endif() # if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it: if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "8" STREQUAL "") - return() + return() endif() # check that the installed version has the same 32/64bit-ness as the one which is currently searching: if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "8") - math(EXPR installedBits "8 * 8") - set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)") - set(PACKAGE_VERSION_UNSUITABLE TRUE) + math(EXPR installedBits "8 * 8") + set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)") + set(PACKAGE_VERSION_UNSUITABLE TRUE) endif() diff --git a/Hw7&8/cmake-build-debug/googletest-download/CMakeCache.txt b/Hw7&8/cmake-build-debug/googletest-download/CMakeCache.txt index 643691b..fce9acf 100644 --- a/Hw7&8/cmake-build-debug/googletest-download/CMakeCache.txt +++ b/Hw7&8/cmake-build-debug/googletest-download/CMakeCache.txt @@ -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 diff --git a/Hw7&8/cmake-build-debug/googletest-download/CMakeFiles/CMakeDirectoryInformation.cmake b/Hw7&8/cmake-build-debug/googletest-download/CMakeFiles/CMakeDirectoryInformation.cmake index 4d8d12b..6327126 100644 --- a/Hw7&8/cmake-build-debug/googletest-download/CMakeFiles/CMakeDirectoryInformation.cmake +++ b/Hw7&8/cmake-build-debug/googletest-download/CMakeFiles/CMakeDirectoryInformation.cmake @@ -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") diff --git a/Hw7&8/cmake-build-debug/googletest-download/CMakeFiles/CMakeRuleHashes.txt b/Hw7&8/cmake-build-debug/googletest-download/CMakeFiles/CMakeRuleHashes.txt index f25e967..9022492 100644 --- a/Hw7&8/cmake-build-debug/googletest-download/CMakeFiles/CMakeRuleHashes.txt +++ b/Hw7&8/cmake-build-debug/googletest-download/CMakeFiles/CMakeRuleHashes.txt @@ -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 diff --git a/Hw7&8/cmake-build-debug/googletest-download/CMakeFiles/Makefile.cmake b/Hw7&8/cmake-build-debug/googletest-download/CMakeFiles/Makefile.cmake index 8f080ce..6552dab 100644 --- a/Hw7&8/cmake-build-debug/googletest-download/CMakeFiles/Makefile.cmake +++ b/Hw7&8/cmake-build-debug/googletest-download/CMakeFiles/Makefile.cmake @@ -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: diff --git a/Hw7&8/cmake-build-debug/googletest-download/CMakeFiles/Makefile2 b/Hw7&8/cmake-build-debug/googletest-download/CMakeFiles/Makefile2 index 291e39c..d775e96 100644 --- a/Hw7&8/cmake-build-debug/googletest-download/CMakeFiles/Makefile2 +++ b/Hw7&8/cmake-build-debug/googletest-download/CMakeFiles/Makefile2 @@ -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. diff --git a/Hw7&8/cmake-build-debug/googletest-download/CMakeFiles/googletest.dir/build.make b/Hw7&8/cmake-build-debug/googletest-download/CMakeFiles/googletest.dir/build.make index 7908d7d..c0afaf2 100644 --- a/Hw7&8/cmake-build-debug/googletest-download/CMakeFiles/googletest.dir/build.make +++ b/Hw7&8/cmake-build-debug/googletest-download/CMakeFiles/googletest.dir/build.make @@ -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 diff --git a/Hw7&8/cmake-build-debug/googletest-download/CMakeFiles/googletest.dir/cmake_clean.cmake b/Hw7&8/cmake-build-debug/googletest-download/CMakeFiles/googletest.dir/cmake_clean.cmake index 46d5865..75f3a42 100644 --- a/Hw7&8/cmake-build-debug/googletest-download/CMakeFiles/googletest.dir/cmake_clean.cmake +++ b/Hw7&8/cmake-build-debug/googletest-download/CMakeFiles/googletest.dir/cmake_clean.cmake @@ -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. diff --git a/Hw7&8/cmake-build-debug/googletest-download/CMakeFiles/googletest.dir/depend.internal b/Hw7&8/cmake-build-debug/googletest-download/CMakeFiles/googletest.dir/depend.internal index 3285e6b..bf300f1 100644 --- a/Hw7&8/cmake-build-debug/googletest-download/CMakeFiles/googletest.dir/depend.internal +++ b/Hw7&8/cmake-build-debug/googletest-download/CMakeFiles/googletest.dir/depend.internal @@ -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 diff --git a/Hw7&8/cmake-build-debug/googletest-download/CMakeFiles/googletest.dir/depend.make b/Hw7&8/cmake-build-debug/googletest-download/CMakeFiles/googletest.dir/depend.make index 3285e6b..bf300f1 100644 --- a/Hw7&8/cmake-build-debug/googletest-download/CMakeFiles/googletest.dir/depend.make +++ b/Hw7&8/cmake-build-debug/googletest-download/CMakeFiles/googletest.dir/depend.make @@ -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 diff --git a/Hw7&8/cmake-build-debug/googletest-download/Makefile b/Hw7&8/cmake-build-debug/googletest-download/Makefile index 706f3bd..566e5f6 100644 --- a/Hw7&8/cmake-build-debug/googletest-download/Makefile +++ b/Hw7&8/cmake-build-debug/googletest-download/Makefile @@ -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 diff --git a/Hw7&8/cmake-build-debug/googletest-download/googletest-prefix/src/googletest-stamp/googletest-gitclone-lastrun.txt b/Hw7&8/cmake-build-debug/googletest-download/googletest-prefix/src/googletest-stamp/googletest-gitclone-lastrun.txt index 72001df..477e672 100644 --- a/Hw7&8/cmake-build-debug/googletest-download/googletest-prefix/src/googletest-stamp/googletest-gitclone-lastrun.txt +++ b/Hw7&8/cmake-build-debug/googletest-download/googletest-prefix/src/googletest-stamp/googletest-gitclone-lastrun.txt @@ -1,3 +1,3 @@ repository='https://github.com/google/googletest.git' module='' -tag='' +tag='origin' diff --git a/Hw7&8/cmake-build-debug/googletest-download/googletest-prefix/src/googletest-stamp/googletest-gitinfo.txt b/Hw7&8/cmake-build-debug/googletest-download/googletest-prefix/src/googletest-stamp/googletest-gitinfo.txt index 72001df..477e672 100644 --- a/Hw7&8/cmake-build-debug/googletest-download/googletest-prefix/src/googletest-stamp/googletest-gitinfo.txt +++ b/Hw7&8/cmake-build-debug/googletest-download/googletest-prefix/src/googletest-stamp/googletest-gitinfo.txt @@ -1,3 +1,3 @@ repository='https://github.com/google/googletest.git' module='' -tag='' +tag='origin' diff --git a/Hw7&8/cmake-build-debug/googletest-download/googletest-prefix/tmp/googletest-gitclone.cmake b/Hw7&8/cmake-build-debug/googletest-download/googletest-prefix/tmp/googletest-gitclone.cmake index ba3a28d..7ba8e50 100644 --- a/Hw7&8/cmake-build-debug/googletest-download/googletest-prefix/tmp/googletest-gitclone.cmake +++ b/Hw7&8/cmake-build-debug/googletest-download/googletest-prefix/tmp/googletest-gitclone.cmake @@ -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) diff --git a/Hw7&8/cmake-build-debug/googletest-download/googletest-prefix/tmp/googletest-gitupdate.cmake b/Hw7&8/cmake-build-debug/googletest-download/googletest-prefix/tmp/googletest-gitupdate.cmake index d642ffb..6d82fe5 100644 --- a/Hw7&8/cmake-build-debug/googletest-download/googletest-prefix/tmp/googletest-gitupdate.cmake +++ b/Hw7&8/cmake-build-debug/googletest-download/googletest-prefix/tmp/googletest-gitupdate.cmake @@ -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 diff --git a/Hw7&8/cmake-build-debug/lib/libgtest_maind.a b/Hw7&8/cmake-build-debug/lib/libgtest_maind.a index 28172f6..91229b7 100644 Binary files a/Hw7&8/cmake-build-debug/lib/libgtest_maind.a and b/Hw7&8/cmake-build-debug/lib/libgtest_maind.a differ diff --git a/Hw7&8/cmake-build-debug/lib/libgtestd.a b/Hw7&8/cmake-build-debug/lib/libgtestd.a index 37baf92..834338a 100644 Binary files a/Hw7&8/cmake-build-debug/lib/libgtestd.a and b/Hw7&8/cmake-build-debug/lib/libgtestd.a differ diff --git a/Hw7&8/weight.hpp b/Hw7&8/weight.hpp index 94c2093..876b49d 100644 --- a/Hw7&8/weight.hpp +++ b/Hw7&8/weight.hpp @@ -57,9 +57,9 @@ namespace usu } //america - using ounce = weight>; - using pound = weight>; - using ton = weight>; + using ounce = weight, double>; + using pound = weight, double>; + using ton = weight, double>; //metrics using microgram = weight>; using gram = weight>;