[mlpack-git] master: Minor cleanup (svn -> git transition). (870007c)
gitdub at big.cc.gt.atl.ga.us
gitdub at big.cc.gt.atl.ga.us
Wed Mar 25 16:37:16 EDT 2015
Repository : https://github.com/mlpack/mlpack
On branch : master
Link : https://github.com/mlpack/mlpack/compare/aaa17fc7f5a64c2e91fdc2eeb6aec0f7829d68d4...870007c6afe8c83358787d6cb2422e2356e73287
>---------------------------------------------------------------
commit 870007c6afe8c83358787d6cb2422e2356e73287
Author: Marcus Edel <marcus.edel at fu-berlin.de>
Date: Wed Mar 25 21:37:08 2015 +0100
Minor cleanup (svn -> git transition).
>---------------------------------------------------------------
870007c6afe8c83358787d6cb2422e2356e73287
CMake/CreateGitVersionHeader.cmake | 4 ++--
CMakeLists.txt | 8 +++-----
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/CMake/CreateGitVersionHeader.cmake b/CMake/CreateGitVersionHeader.cmake
index 7de9691..83855a1 100644
--- a/CMake/CreateGitVersionHeader.cmake
+++ b/CMake/CreateGitVersionHeader.cmake
@@ -1,6 +1,6 @@
-# Using the CMake subversion tools, create svnversion.hpp, which just contains
+# Using the CMake tools to create the gitversion.hpp, which just contains
# the implementation of GetVersion() assuming that we are working inside of a
-# subversion repository.
+# git repository.
find_package(Git)
execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 681c06e..be7f8af 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -257,9 +257,8 @@ endif (WIN32)
find_package(Git)
set (USING_GIT "NO")
if (GIT_FOUND)
- # Run svn info to find out if this is a working copy. If the return code is
- # not 0, then it isn't. The following line is taken from
- # FindSubversion.cmake...
+ # Run 'git rev-parse HEAD' to find out if this is a working copy. If the
+ # return code is not 0, then it isn't.
execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse HEAD
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
OUTPUT_VARIABLE MLPACK_TMP_REV_INFO
@@ -269,13 +268,12 @@ if (GIT_FOUND)
if (${MLPACK_TMP_REV_INFO_RESULT} EQUAL 0)
set (USING_GIT "YES")
add_definitions(-D__MLPACK_GIT_VERSION)
- include(CMake/CreateGitVersionHeader.cmake)
add_custom_target(mlpack_gitversion ALL
COMMAND ${CMAKE_COMMAND} -P CMake/CreateGitVersionHeader.cmake
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
COMMENT "Updating gitnversion.hpp (if necessary)")
- # Add svnversion.hpp to the list of sources.
+ # Add gitversion.hpp to the list of sources.
set(MLPACK_SRCS ${MLPACK_SRCS}
"${CMAKE_CURRENT_SOURCE_DIR}/src/mlpack/core/util/gitversion.hpp")
endif (${MLPACK_TMP_REV_INFO_RESULT} EQUAL 0)
More information about the mlpack-git
mailing list