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).
This commit is contained in:
Rob Gowin
2016-07-16 14:12:58 -05:00
parent 2c268ba09c
commit fa8723ea6d
2 changed files with 5 additions and 3 deletions

View File

@@ -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.

View File

@@ -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()
ENDMACRO()