gnucash maint: Tweak version.cmake to work on Windows.
John Ralls
jralls at code.gnucash.org
Fri Jul 8 12:39:37 EDT 2016
Updated via https://github.com/Gnucash/gnucash/commit/6ad8ff3b (commit)
from https://github.com/Gnucash/gnucash/commit/b64fe864 (commit)
commit 6ad8ff3b4e721d6c9132256ce8511da58796712c
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Jul 8 16:34:35 2016 +0000
Tweak version.cmake to work on Windows.
Cmake's execute_process doesn't use a shell unless you tell it to.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 913834e..24752ad 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -117,7 +117,6 @@ IF (WIN32)
SET(PKG_CONFIG_EXECUTABLE ${CMAKE_PREFIX_PATH}/gnome/bin/pkg-config.exe)
SET(SWIG_EXECUTABLE ${CMAKE_PREFIX_PATH}/swig/swig.exe)
SET(BOOST_ROOT ${CMAKE_PREFIX_PATH}/boost)
- SET(GIT_EXECUTABLE ${CMAKE_PREFIX_PATH}/git-1.9.4/bin/git)
SET(REGEX_INCLUDE_PATH ${CMAKE_PREFIX_PATH}/regex/include)
SET(REGEX_LDFLAGS "-L${CMAKE_PREFIX_PATH}/regex/lib -lregex")
SET(LIBXSLT_INCLUDE_DIR ${CMAKE_PREFIX_PATH}/libxslt/include)
diff --git a/src/core-utils/CMakeLists.txt b/src/core-utils/CMakeLists.txt
index 80e59f3..55de0ad 100644
--- a/src/core-utils/CMakeLists.txt
+++ b/src/core-utils/CMakeLists.txt
@@ -64,15 +64,13 @@ FILE (WRITE ${CMAKE_CURRENT_BINARY_DIR}/gnc-version.h ${GNC_VERSION_H_CONTENT})
### Create gnc-vcs-info.h
# The meta-cmake gymnastics here come from https://cmake.org/pipermail/cmake/2010-July/038015.html
-FIND_PACKAGE(Git)
-
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/gnc-vcs-info.h.in
"/* Autogenerated. Do not change. */\n#define GNUCASH_SCM_REV \"@GNUCASH_SCM_REV@\"\n"
)
SET(SCM_REV_COMMAND "${CMAKE_SOURCE_DIR}/util/gnc-vcs-info -r")
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/version.cmake
"EXECUTE_PROCESS(
- COMMAND ${SCM_REV_COMMAND} ${CMAKE_SOURCE_DIR}
+ COMMAND ${SHELL} ${SCM_REV_COMMAND} ${CMAKE_SOURCE_DIR}
OUTPUT_VARIABLE GNUCASH_SCM_REV
OUTPUT_STRIP_TRAILING_WHITESPACE
)
Summary of changes:
CMakeLists.txt | 1 -
src/core-utils/CMakeLists.txt | 4 +---
2 files changed, 1 insertion(+), 4 deletions(-)
More information about the gnucash-changes
mailing list