gnucash master: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/f0d4a971 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/fa8723ea (commit)
	from  https://github.com/Gnucash/gnucash/commit/6252fcf1 (commit)



commit f0d4a9719a233b414fca27d118a1475b0447dd69
Merge: 6252fcf fa8723e
Author: John Ralls <jralls at ceridwen.us>
Date:   Sat Jul 16 13:23:42 2016 -0700

    Merge branch 'maint'

diff --cc CMakeLists.txt
index 0f9de68,f7b0d17..ed0c1fa
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -329,36 -329,11 +329,38 @@@ 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.
 +#BOOST
 +IF (APPLE)
 +  # I suppose I would rather use the shared Boost libraries here, but the Boost install procedure
 +  # does not set RPATH for it's shared library correctly. It uses a 'naked' RPATH, which requires
 +  # that DYLD_FALLBACK_LIBRARY_PATH be set. There is supposedly a dll-path option so set RPATH, but
 +  # I can't get it to work (http://www.boost.org/build/doc/html/bbv2/faq/dll-path.html) and neither
 +  # can some other random person on the internet:
 +  # http://stackoverflow.com/questions/33667795/dll-path-has-no-effect-when-building-boost
 +  # Using static libs simplifies things.
 +  SET (Boost_USE_STATIC_LIBS ON)
 +  SET (Boost_USE_STATIC_RUNTIME ON)
 +ELSE()
 +  SET (Boost_USE_STATIC_LIBS OFF)
 +  SET (Boost_USE_STATIC_RUNTIME OFF)
 +ENDIF()
 +
 +SET (Boost_USE_MULTITHREADED ON)
 +SET (Boost_FIND_QUIETLY ON)
 +
 +FIND_PACKAGE (Boost 1.54.0 REQUIRED COMPONENTS date_time regex)
 +
 +IF (Boost_FOUND)
 +  include_directories(${Boost_INCLUDE_DIRS})
 +  SET(HAVE_BOOST 1)
 +ELSE (Boost_FOUND)
 +  MESSAGE (SEND_ERROR "Boost 1.54.0 or later is not installed, and is required. Please install it and ensure that the following libraries are built: chrono, date_time, filesystem, log, program_options, regex, signals, system, and test.")
 +ENDIF (Boost_FOUND)
 +
  
  # Compiler flags
  

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