gnucash maint: Fixes to get CMake "MinGW Makefiles" generator to work.
John Ralls
jralls at code.gnucash.org
Sat Jul 16 16:23:03 EDT 2016
Updated via https://github.com/Gnucash/gnucash/commit/fa8723ea (commit)
from https://github.com/Gnucash/gnucash/commit/2c268ba0 (commit)
commit fa8723ea6d30dc680fc8a981e6658f83249866af
Author: Rob Gowin <robgowin at gmail.com>
Date: Sat Jul 16 14:12:58 2016 -0500
Fixes to get CMake "MinGW Makefiles" generator to work.
* CMakeLists.txt: Give CMake a hint about where to find pod2man
based on where it found perl.
* src/cmake_modules/GncConfigure.cmake: Protect GNC_HELPDIR in
quotes for cases where it contains spaces (like "C:\Program Files"
on Windows).
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bbd1fa8..f7b0d17 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -329,7 +329,9 @@ if (NOT PERL_FOUND)
MESSAGE(SEND_ERROR "Perl executable not found. Please set PERL_EXECUTABLE.")
ENDIF(NOT PERL_FOUND)
-FIND_PROGRAM(POD2MAN_EXECUTABLE pod2man)
+GET_FILENAME_COMPONENT(PERL_DIR ${PERL_EXECUTABLE} DIRECTORY)
+
+FIND_PROGRAM(POD2MAN_EXECUTABLE pod2man HINTS ${PERL_DIR})
# Boost stuff removed, not required on maint.
diff --git a/src/cmake_modules/GncConfigure.cmake b/src/cmake_modules/GncConfigure.cmake
index 8643e8a..d7c1a27 100644
--- a/src/cmake_modules/GncConfigure.cmake
+++ b/src/cmake_modules/GncConfigure.cmake
@@ -23,7 +23,7 @@ MACRO (GNC_CONFIGURE2 _INPUT _OUTPUT)
FILE(WRITE ${_TMPDIR}/${_INPUT}.cmake
"SET(PERL ${PERL_EXECUTABLE})
SET(VERSION ${VERSION})
- SET(GNC_HELPDIR ${GNC_HELPDIR})
+ SET(GNC_HELPDIR \"${GNC_HELPDIR}\")
SET(GETTEXT_PACKAGE ${GETTEXT_PACKAGE})
CONFIGURE_FILE(\${SRC} \${DST} @ONLY)")
@@ -39,4 +39,4 @@ MACRO (GNC_CONFIGURE2 _INPUT _OUTPUT)
-P ${_TMPDIR}/${_INPUT}.cmake
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_INPUT}
)
-ENDMACRO()
\ No newline at end of file
+ENDMACRO()
Summary of changes:
CMakeLists.txt | 4 +++-
src/cmake_modules/GncConfigure.cmake | 4 ++--
2 files changed, 5 insertions(+), 3 deletions(-)
More information about the gnucash-changes
mailing list