aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoakim Karlsson <oakimk@gmail.com>2018-05-13 09:32:25 +0200
committerPeter Wu <peter@lekensteyn.nl>2018-05-15 09:06:43 +0000
commite21da738262af2ba6cf72f46fdc045f0337ca27e (patch)
tree78f4dad6afd357e0d85e64f3c658fb706171a503
parent4fd404d8da00e7af567c82663771088174904fdd (diff)
CMake: fix Git binary parameter
if (${GIT_EXECUTABLE}) never worked, hence the variable GIT_BIN_PARAM never had any value, and by so never added the Optional git-bin parameter to make-version.pl Make-version.pl now handle optional git-bin argument with value. Change-Id: I089539a3d33455b8de09928b54e0ea39d1aecbb8 Reviewed-on: https://code.wireshark.org/review/27485 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-rw-r--r--CMakeLists.txt4
-rwxr-xr-xmake-version.pl2
2 files changed, 3 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ad2d0f0cbb..2291ff9f2a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1402,8 +1402,8 @@ endif()
include(gmxTestLargeFiles)
gmx_test_large_files(GMX_LARGEFILES)
-if (${GIT_EXECUTABLE})
- set(GIT_BIN_PARAM "--git-bin ${GIT_EXECUTABLE}")
+if (GIT_EXECUTABLE)
+ set(GIT_BIN_PARAM --git-bin ${GIT_EXECUTABLE})
endif()
set( VERSION ${PROJECT_VERSION} )
if(NOT CMAKE_VERSION VERSION_LESS "3.2.1")
diff --git a/make-version.pl b/make-version.pl
index 001e52f321..a241ec4810 100755
--- a/make-version.pl
+++ b/make-version.pl
@@ -627,7 +627,7 @@ sub get_config {
"help|h", \$show_help,
"get-vcs|get-svn|g", \$get_vcs,
"set-vcs|set-svn|s", \$set_vcs,
- "git-bin", \$git_executable,
+ "git-bin=s" => \$git_executable,
"print-vcs", \$print_vcs,
"set-version|v", \$set_version,
"set-release|r|package-version|p", \$set_release,