Merge pull request #957 from dimacurrentai/cmake

Fixed all the repo & branch makes after the `cmake` PR is mergeed in.

cmake/CMakeLists.txt

@@ -35,10 +35,7 @@ function(UseOrGitClone dep remote branch)
   endif()
 endfunction()
 
-#UseOrGitClone(current https://github.com/c5t/current stable)
-UseOrGitClone(current https://github.com/dimacurrentai/current cmake)
-# TODO(dkorolev): Fix this once the PR is merged.
-
+UseOrGitClone(current https://github.com/c5t/current stable)
 UseOrGitClone(googletest https://github.com/c5t/googletest v1.14)
 
 # Declare shared libraries as shared library targets. Do not link them against anything external.

cmake/Makefile

@@ -3,8 +3,7 @@
 # Yes, I am well aware it is ugly to have a `Makefile` for a `cmake`-built project.
 #
 # However, there is quite some value.
-# Please see the README of https://github.com/dimacurrentai/Current/tree/cmake/cmake for more details.
-# TODO(dkorolev): Fix the repo & branch on the line above once merged.
+# Please see the README of https://github.com/C5T/Current/tree/stable/cmake for more details.
 #
 # Besides, this `Makefiles` makes `:mak` in Vim work like a charm!
 
@@ -51,10 +50,8 @@ test: release_test
 fmt:
 	${CLANG_FORMAT} -i src/*.cc src/*.h
 
-# TODO(dkorolev): Use the proper repo & branch name.
 CMakeLists.txt:
-	@curl -s https://raw.githubusercontent.com/dimacurrentai/Current/cmake/cmake/CMakeLists.txt >$@
-	# TODO(dkorolev): Fix the repo & branch on the line above once merged.
+	@curl -s https://raw.githubusercontent.com/C5T/Current/stable/cmake/CMakeLists.txt >$@
 
 clean:
 	rm -rf "${DEBUG_BUILD_DIR}" "${RELEASE_BUILD_DIR}"

cmake/README.md

@@ -22,6 +22,4 @@ This `CMakeLists.txt` is accompanied by a `Makefile`. Together, they:
 
 The `test/` directory in this repo illustrates what it takes to use this `Makefile` + `CMakeLists.txt`.
 
-Please refer to [`run-cmake-test.sh`](https://github.com/dimacurrentai/Current/blob/cmake/cmake/run-cmake-test.sh) for a comprehensive end-to-end test for the above.
-
-TODO(dkorolev): Fix the path once the the PR is merged in.
+Please refer to [`run-cmake-test.sh`](https://github.com/c5t/Current/blob/stable/cmake/run-cmake-test.sh) for a comprehensive end-to-end test for the above.

cmake/run-cmake-test.sh

@@ -28,8 +28,7 @@ fi
 
 if ! [ -s Makefile ] ; then
   echo 'Need the `Makefile`, `curl`-ing one.'
-  curl -s https://raw.githubusercontent.com/dimacurrentai/Current/cmake/cmake/Makefile >Makefile
-	# TODO(dkorolev): Fix the repo & branch on the line above once merged.
+  curl -s https://raw.githubusercontent.com/C5T/Current/stable/cmake/Makefile >Makefile
 fi
 
 # NOTE(dkorolev): This test run `curl`-s the `Makefile`.