fixed cmake

2019-11-19 23:09:13 -07:00
parent 4d7d7551fc
commit 4ca4d8f02c
5 changed files with 65 additions and 64 deletions
--- a/HW8/CMakeLists.txt
+++ b/HW8/CMakeLists.txt
@@ -7,28 +7,29 @@ set(CMAKE_CXX_STANDARD 17)
 # Manually specifying all the source files.
 #
 set(HEADER_FILES
-        shared_ptr.hpp)
+        shared_ptr.hpp
+        )
 set(SOURCE_FILES
-        #TestMemory.cpp
+        #weight.cpp
        )
 set(UNIT_TEST_FILES
        TestMemory.cpp)

-add_executable(SharedPtr ${HEADER_FILES} ${SOURCE_FILES} main.cpp)
+add_executable(TestMemory ${HEADER_FILES} ${SOURCE_FILES} main.cpp)
 add_executable(UnitTestRunner  ${HEADER_FILES} ${SOURCE_FILES} ${UNIT_TEST_FILES})

 #
 # We want the C++ 17 standard for our project
 #
-set_property(TARGET SharedPtr PROPERTY CXX_STANDARD 17)
+set_property(TARGET TestMemory PROPERTY CXX_STANDARD 17)
 set_property(TARGET UnitTestRunner PROPERTY CXX_STANDARD 17)

 if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
-    target_compile_options(SharedPtr PRIVATE /W4 /permissive-)
+    target_compile_options(TestMemory PRIVATE /W4 /permissive-)
    target_compile_options(UnitTestRunner PRIVATE /W4 /permissive-)
    set_target_properties(UnitTestRunner PROPERTIES LINK_FLAGS "/STACK:10000000")
 elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-    target_compile_options(SharedPtr PRIVATE -Wall -Wextra -pedantic -Wl,--stack,10000000 -O3)
+    target_compile_options(TestMemory PRIVATE -Wall -Wextra -pedantic -Wl,--stack,10000000 -O3)
    target_compile_options(UnitTestRunner PRIVATE -Wall -Wextra -pedantic -Wl,--stack,10000000 -O3)
 endif()

@@ -61,7 +62,7 @@ if (CLANG_FORMAT)
    #
    # This makes the clang-format target a dependency of the main GoogleTestIntro project
    #
-#    add_dependencies(Weights ClangFormat)
+    #    add_dependencies(Weights ClangFormat)
 else()
    message("Unable to find clang-format")
 endif()
--- a/HW8/cmake-build-debug/CMakeFiles/Makefile.cmake
+++ b/HW8/cmake-build-debug/CMakeFiles/Makefile.cmake
@@ -78,9 +78,9 @@ set(CMAKE_MAKEFILE_PRODUCTS

 # Dependency information for all targets:
 set(CMAKE_DEPEND_INFO_FILES
-  "CMakeFiles/SharedPtr.dir/DependInfo.cmake"
  "CMakeFiles/ClangFormat.dir/DependInfo.cmake"
  "CMakeFiles/UnitTestRunner.dir/DependInfo.cmake"
+  "CMakeFiles/TestMemory.dir/DependInfo.cmake"
  "googletest-build/googlemock/CMakeFiles/gmock.dir/DependInfo.cmake"
  "googletest-build/googlemock/CMakeFiles/gmock_main.dir/DependInfo.cmake"
  "googletest-build/googletest/CMakeFiles/gtest_main.dir/DependInfo.cmake"
--- a/HW8/cmake-build-debug/CMakeFiles/Makefile2
+++ b/HW8/cmake-build-debug/CMakeFiles/Makefile2
@@ -64,43 +64,6 @@ CMAKE_SOURCE_DIR = /Users/bradybodily/Repositories/CS3460/HW8
 # The top-level build directory on which CMake was run.
 CMAKE_BINARY_DIR = /Users/bradybodily/Repositories/CS3460/HW8/cmake-build-debug

-#=============================================================================
-# Target rules for target CMakeFiles/SharedPtr.dir
-
-# All Build rule for target.
-CMakeFiles/SharedPtr.dir/all:
-	$(MAKE) -f CMakeFiles/SharedPtr.dir/build.make CMakeFiles/SharedPtr.dir/depend
-	$(MAKE) -f CMakeFiles/SharedPtr.dir/build.make CMakeFiles/SharedPtr.dir/build
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/Users/bradybodily/Repositories/CS3460/HW8/cmake-build-debug/CMakeFiles --progress-num=1,2 "Built target SharedPtr"
-.PHONY : CMakeFiles/SharedPtr.dir/all
-
-# Include target in all.
-all: CMakeFiles/SharedPtr.dir/all
-
-.PHONY : all
-
-# Build rule for subdir invocation for target.
-CMakeFiles/SharedPtr.dir/rule: cmake_check_build_system
-	$(CMAKE_COMMAND) -E cmake_progress_start /Users/bradybodily/Repositories/CS3460/HW8/cmake-build-debug/CMakeFiles 2
-	$(MAKE) -f CMakeFiles/Makefile2 CMakeFiles/SharedPtr.dir/all
-	$(CMAKE_COMMAND) -E cmake_progress_start /Users/bradybodily/Repositories/CS3460/HW8/cmake-build-debug/CMakeFiles 0
-.PHONY : CMakeFiles/SharedPtr.dir/rule
-
-# Convenience name for target.
-SharedPtr: CMakeFiles/SharedPtr.dir/rule
-
-.PHONY : SharedPtr
-
-# clean rule for target.
-CMakeFiles/SharedPtr.dir/clean:
-	$(MAKE) -f CMakeFiles/SharedPtr.dir/build.make CMakeFiles/SharedPtr.dir/clean
-.PHONY : CMakeFiles/SharedPtr.dir/clean
-
-# clean rule for target.
-clean: CMakeFiles/SharedPtr.dir/clean
-
-.PHONY : clean
-
 #=============================================================================
 # Target rules for target CMakeFiles/ClangFormat.dir

@@ -171,6 +134,43 @@ clean: CMakeFiles/UnitTestRunner.dir/clean

 .PHONY : clean

+#=============================================================================
+# Target rules for target CMakeFiles/TestMemory.dir
+
+# All Build rule for target.
+CMakeFiles/TestMemory.dir/all:
+	$(MAKE) -f CMakeFiles/TestMemory.dir/build.make CMakeFiles/TestMemory.dir/depend
+	$(MAKE) -f CMakeFiles/TestMemory.dir/build.make CMakeFiles/TestMemory.dir/build
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/Users/bradybodily/Repositories/CS3460/HW8/cmake-build-debug/CMakeFiles --progress-num=1,2 "Built target TestMemory"
+.PHONY : CMakeFiles/TestMemory.dir/all
+
+# Include target in all.
+all: CMakeFiles/TestMemory.dir/all
+
+.PHONY : all
+
+# Build rule for subdir invocation for target.
+CMakeFiles/TestMemory.dir/rule: cmake_check_build_system
+	$(CMAKE_COMMAND) -E cmake_progress_start /Users/bradybodily/Repositories/CS3460/HW8/cmake-build-debug/CMakeFiles 2
+	$(MAKE) -f CMakeFiles/Makefile2 CMakeFiles/TestMemory.dir/all
+	$(CMAKE_COMMAND) -E cmake_progress_start /Users/bradybodily/Repositories/CS3460/HW8/cmake-build-debug/CMakeFiles 0
+.PHONY : CMakeFiles/TestMemory.dir/rule
+
+# Convenience name for target.
+TestMemory: CMakeFiles/TestMemory.dir/rule
+
+.PHONY : TestMemory
+
+# clean rule for target.
+CMakeFiles/TestMemory.dir/clean:
+	$(MAKE) -f CMakeFiles/TestMemory.dir/build.make CMakeFiles/TestMemory.dir/clean
+.PHONY : CMakeFiles/TestMemory.dir/clean
+
+# clean rule for target.
+clean: CMakeFiles/TestMemory.dir/clean
+
+.PHONY : clean
+
 #=============================================================================
 # Directory level rules for directory googletest-build

@@ -245,8 +245,8 @@ clean: googletest-build/googlemock/CMakeFiles/gmock.dir/clean
 # Target rules for target googletest-build/googlemock/CMakeFiles/gmock_main.dir

 # All Build rule for target.
-googletest-build/googlemock/CMakeFiles/gmock_main.dir/all: googletest-build/googletest/CMakeFiles/gtest.dir/all
 googletest-build/googlemock/CMakeFiles/gmock_main.dir/all: googletest-build/googlemock/CMakeFiles/gmock.dir/all
+googletest-build/googlemock/CMakeFiles/gmock_main.dir/all: googletest-build/googletest/CMakeFiles/gtest.dir/all
 	$(MAKE) -f googletest-build/googlemock/CMakeFiles/gmock_main.dir/build.make googletest-build/googlemock/CMakeFiles/gmock_main.dir/depend
 	$(MAKE) -f googletest-build/googlemock/CMakeFiles/gmock_main.dir/build.make googletest-build/googlemock/CMakeFiles/gmock_main.dir/build
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/Users/bradybodily/Repositories/CS3460/HW8/cmake-build-debug/CMakeFiles --progress-num=7,8 "Built target gmock_main"
--- a/HW8/cmake-build-debug/CMakeFiles/TargetDirectories.txt
+++ b/HW8/cmake-build-debug/CMakeFiles/TargetDirectories.txt
@@ -2,11 +2,11 @@
 /Users/bradybodily/Repositories/CS3460/HW8/cmake-build-debug/CMakeFiles/install/strip.dir
 /Users/bradybodily/Repositories/CS3460/HW8/cmake-build-debug/CMakeFiles/install.dir
 /Users/bradybodily/Repositories/CS3460/HW8/cmake-build-debug/CMakeFiles/list_install_components.dir
-/Users/bradybodily/Repositories/CS3460/HW8/cmake-build-debug/CMakeFiles/SharedPtr.dir
 /Users/bradybodily/Repositories/CS3460/HW8/cmake-build-debug/CMakeFiles/rebuild_cache.dir
 /Users/bradybodily/Repositories/CS3460/HW8/cmake-build-debug/CMakeFiles/edit_cache.dir
 /Users/bradybodily/Repositories/CS3460/HW8/cmake-build-debug/CMakeFiles/ClangFormat.dir
 /Users/bradybodily/Repositories/CS3460/HW8/cmake-build-debug/CMakeFiles/UnitTestRunner.dir
+/Users/bradybodily/Repositories/CS3460/HW8/cmake-build-debug/CMakeFiles/TestMemory.dir
 /Users/bradybodily/Repositories/CS3460/HW8/cmake-build-debug/googletest-build/CMakeFiles/install/local.dir
 /Users/bradybodily/Repositories/CS3460/HW8/cmake-build-debug/googletest-build/CMakeFiles/install/strip.dir
 /Users/bradybodily/Repositories/CS3460/HW8/cmake-build-debug/googletest-build/CMakeFiles/install.dir
--- a/HW8/cmake-build-debug/Makefile
+++ b/HW8/cmake-build-debug/Makefile
@@ -156,19 +156,6 @@ depend:
 	$(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
 .PHONY : depend

-#=============================================================================
-# Target rules for targets named SharedPtr
-
-# Build rule for target.
-SharedPtr: cmake_check_build_system
-	$(MAKE) -f CMakeFiles/Makefile2 SharedPtr
-.PHONY : SharedPtr
-
-# fast build rule for target.
-SharedPtr/fast:
-	$(MAKE) -f CMakeFiles/SharedPtr.dir/build.make CMakeFiles/SharedPtr.dir/build
-.PHONY : SharedPtr/fast
-
 #=============================================================================
 # Target rules for targets named ClangFormat

@@ -195,6 +182,19 @@ UnitTestRunner/fast:
 	$(MAKE) -f CMakeFiles/UnitTestRunner.dir/build.make CMakeFiles/UnitTestRunner.dir/build
 .PHONY : UnitTestRunner/fast

+#=============================================================================
+# Target rules for targets named TestMemory
+
+# Build rule for target.
+TestMemory: cmake_check_build_system
+	$(MAKE) -f CMakeFiles/Makefile2 TestMemory
+.PHONY : TestMemory
+
+# fast build rule for target.
+TestMemory/fast:
+	$(MAKE) -f CMakeFiles/TestMemory.dir/build.make CMakeFiles/TestMemory.dir/build
+.PHONY : TestMemory/fast
+
 #=============================================================================
 # Target rules for targets named gmock

@@ -280,7 +280,7 @@ main.o: main.cpp.o

 # target to build an object file
 main.cpp.o:
-	$(MAKE) -f CMakeFiles/SharedPtr.dir/build.make CMakeFiles/SharedPtr.dir/main.cpp.o
+	$(MAKE) -f CMakeFiles/TestMemory.dir/build.make CMakeFiles/TestMemory.dir/main.cpp.o
 .PHONY : main.cpp.o

 main.i: main.cpp.i
@@ -289,7 +289,7 @@ main.i: main.cpp.i

 # target to preprocess a source file
 main.cpp.i:
-	$(MAKE) -f CMakeFiles/SharedPtr.dir/build.make CMakeFiles/SharedPtr.dir/main.cpp.i
+	$(MAKE) -f CMakeFiles/TestMemory.dir/build.make CMakeFiles/TestMemory.dir/main.cpp.i
 .PHONY : main.cpp.i

 main.s: main.cpp.s
@@ -298,7 +298,7 @@ main.s: main.cpp.s

 # target to generate assembly for a file
 main.cpp.s:
-	$(MAKE) -f CMakeFiles/SharedPtr.dir/build.make CMakeFiles/SharedPtr.dir/main.cpp.s
+	$(MAKE) -f CMakeFiles/TestMemory.dir/build.make CMakeFiles/TestMemory.dir/main.cpp.s
 .PHONY : main.cpp.s

 # Help Target
@@ -311,11 +311,11 @@ help:
 	@echo "... install/strip"
 	@echo "... install"
 	@echo "... list_install_components"
-	@echo "... SharedPtr"
 	@echo "... rebuild_cache"
 	@echo "... edit_cache"
 	@echo "... ClangFormat"
 	@echo "... UnitTestRunner"
+	@echo "... TestMemory"
 	@echo "... gmock"
 	@echo "... gmock_main"
 	@echo "... gtest_main"