gnucash unstable: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/edf17ab2 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/89db0ccf (commit)
	from  https://github.com/Gnucash/gnucash/commit/6a9972ac (commit)



commit edf17ab2c54d262f3622e38f5db03aaf28bca0c6
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Jan 7 15:50:35 2018 -0800

    Fix the libgncmod-python installed name.

diff --git a/gnucash/python/CMakeLists.txt b/gnucash/python/CMakeLists.txt
index 1888e37..88f1548 100644
--- a/gnucash/python/CMakeLists.txt
+++ b/gnucash/python/CMakeLists.txt
@@ -10,6 +10,9 @@ IF (WITH_PYTHON)
   TARGET_INCLUDE_DIRECTORIES(gncmod-python
     PRIVATE ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/core_utils ${CMAKE_SOURCE_DIR}/gnc-module ${PYTHON_INCLUDE_DIR})
   TARGET_COMPILE_OPTIONS(gncmod-python PRIVATE -DG_LOG_DOMAIN=\"gnc.python\")
+IF (APPLE)
+  SET_TARGET_PROPERTIES (gncmod-python PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/gnucash")
+ENDIF()
   INSTALL(TARGETS gncmod-python
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash

commit 89db0ccfed077a7dce12657786bb7377d8a35e58
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Jan 7 15:49:29 2018 -0800

    Fix some environment file issues.
    
    * newlines at the end of the pythonpath insertions.
    * Get the DBI block out from the middle of the XDG stuff.
    * Make the installed XDG_DATA_DIRS relocatable.
    * Add GDK_PIXBUF_MODULE_FILE, allows running the Mac bundle without a
      launcher script.

diff --git a/gnucash/CMakeLists.txt b/gnucash/CMakeLists.txt
index 29784aa..39b830e 100644
--- a/gnucash/CMakeLists.txt
+++ b/gnucash/CMakeLists.txt
@@ -135,8 +135,10 @@ SET(XDG_TEXT "
 
 IF (NOT(${CMAKE_INSTALL_FULL_DATADIR} STREQUAL "/usr/share") AND NOT(${CMAKE_INSTALL_FULL_DATADIR} STREQUAL "/usr/local/share"))
   FILE(APPEND ${ENV_FILE_OUT} ${XDG_TEXT})
-  FILE(APPEND ${ENV_FILE_OUT} "XDG_DATA_DIRS=${CMAKE_INSTALL_FULL_DATADIR};{XDG_DATA_DIRS};" "${GNC_SYSTEM_XDG_DATA_DIRS}\n")
+  FILE(APPEND ${ENV_FILE_OUT} "XDG_DATA_DIRS={GNC_HOME}/share;{XDG_DATA_DIRS};" "${GNC_SYSTEM_XDG_DATA_DIRS}\n")
 ENDIF()
+FILE(APPEND ${BUILD_ENV_FILE_OUT} ${XDG_TEXT})
+FILE(APPEND ${BUILD_ENV_FILE_OUT} "XDG_DATA_DIRS=${DATADIR_BUILD};{XDG_DATA_DIRS};" "${GNC_SYSTEM_XDG_DATA_DIRS}\n")
 
 if (LIBDBI_LIBRARY AND LIBDBI_DRIVERS_DIR)
   get_filename_component(libdir ${LIBDBI_LIBRARY} DIRECTORY)
@@ -146,21 +148,23 @@ if (LIBDBI_LIBRARY AND LIBDBI_DRIVERS_DIR)
   endif()
 ENDIF()
 
-FILE(APPEND ${BUILD_ENV_FILE_OUT} ${XDG_TEXT})
-FILE(APPEND ${BUILD_ENV_FILE_OUT} "XDG_DATA_DIRS=${DATADIR_BUILD};{XDG_DATA_DIRS};" "${GNC_SYSTEM_XDG_DATA_DIRS}\n")
-
-SET(PYTHON_TEXT "
+IF (WITH_PYTHON)
+  SET(PYTHON_TEXT "
 # Define PYTHONPATH for non default installation path.\n"
  )
-IF (NOT(${CMAKE_INSTALL_PREFIX} STREQUAL "/usr") AND NOT(${CMAKE_INSTALL_PREFIX} STREQUAL "/usr/local"))
+  IF (NOT(${CMAKE_INSTALL_PREFIX} STREQUAL "/usr") AND NOT(${CMAKE_INSTALL_PREFIX} STREQUAL "/usr/local"))
 
-  FILE(APPEND ${ENV_FILE_OUT} ${PYTHON_TEXT})
-  FILE(APPEND ${ENV_FILE_OUT} "PYTHONPATH=${PYTHON_SYSCONFIG_OUTPUT};{PYTHONPATH}")
-ENDIF()
+    FILE(APPEND ${ENV_FILE_OUT} ${PYTHON_TEXT})
+    FILE(APPEND ${ENV_FILE_OUT} "PYTHONPATH=${PYTHON_SYSCONFIG_OUTPUT};{PYTHONPATH}\n")
+  ENDIF()
 
-FILE(APPEND ${BUILD_ENV_FILE_OUT} ${PYTHON_TEXT})
-FILE(APPEND ${BUILD_ENV_FILE_OUT} "PYTHONPATH=${PYTHON_SYSCONFIG_BUILD};{PYTHONPATH}")
+  FILE(APPEND ${BUILD_ENV_FILE_OUT} ${PYTHON_TEXT})
+  FILE(APPEND ${BUILD_ENV_FILE_OUT} "PYTHONPATH=${PYTHON_SYSCONFIG_BUILD};{PYTHONPATH}\n")
+ENDIF()
 
+IF (MAC_INTEGRATION)
+  file(APPEND ${ENV_FILE_OUT} "GDK_PIXBUF_MODULE_FILE={SYS_LIB}/gdk-pixbuf-2.0/2.10.0/loaders.cache\n")
+ENDIF()
 
 FILE(COPY ${BUILD_ENV_FILE_OUT}
   DESTINATION ${SYSCONFDIR_BUILD}/gnucash



Summary of changes:
 gnucash/CMakeLists.txt        | 26 +++++++++++++++-----------
 gnucash/python/CMakeLists.txt |  3 +++
 2 files changed, 18 insertions(+), 11 deletions(-)