gnucash master: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/43c81b6e (commit)
	 via  https://github.com/Gnucash/gnucash/commit/5b2439e7 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/e1ba2ed4 (commit)
	from  https://github.com/Gnucash/gnucash/commit/77d5d638 (commit)



commit 43c81b6ebbff15ddab3896b7cab5755aed437c37
Author: John Ralls <jralls at ceridwen.us>
Date:   Wed Sep 6 22:28:13 2017 -0700

    Add include of Foundation framework for NSString and NSBundle.

diff --git a/libgnucash/core-utils/gnc-filepath-utils.cpp b/libgnucash/core-utils/gnc-filepath-utils.cpp
index 35481c3..d3e7ca7 100644
--- a/libgnucash/core-utils/gnc-filepath-utils.cpp
+++ b/libgnucash/core-utils/gnc-filepath-utils.cpp
@@ -59,6 +59,9 @@ extern "C" {
 #define PATH_MAX MAXPATHLEN
 #endif
 #endif
+#ifdef MAC_INTEGRATION
+#include <Foundation/Foundation.h>
+#endif
 }
 
 #include <boost/filesystem.hpp>

commit 5b2439e7c993dd65969275836074fd20faf1bd1e
Author: John Ralls <jralls at ceridwen.us>
Date:   Wed Sep 6 22:24:19 2017 -0700

    Set -xobjective-c or -xobjective-c++ for Mac code depending compiler.
    
    Also require at least Cmake-3.3 for Apple as that's the minimum that
    supports the COMPILE_LANGUAGE generator expression.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 61071cf..d94e003 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 # CMakeLists.txt for GnuCash
 
-IF (WIN32)
+IF (WIN32 OR APPLE)
   CMAKE_MINIMUM_REQUIRED (VERSION 3.3.2)
 ELSE()
   CMAKE_MINIMUM_REQUIRED (VERSION 3.0)
@@ -349,7 +349,7 @@ IF(APPLE)
       FIND_LIBRARY(COCOA_LIBRARY Cocoa)
       FIND_LIBRARY(SECURITY_LIBRARY Security)
       FIND_LIBRARY(CARBON_LIBRARY Carbon)
-      SET(OSX_EXTRA_COMPILE_FLAGS -xobjective-c)
+      SET(OSX_EXTRA_COMPILE_FLAGS $<$<COMPILE_LANGUAGE:C>:-xobjective-c> $<$<COMPILE_LANGUAGE:CXX>:-xobjective-c++>)
       SET(OSX_EXTRA_LIBRARIES objc ${COCOA_LIBRARY} ${SECURITY_LIBRARY} ${CARBON_LIBRARY})
     ENDIF(GTK_MAC_FOUND)
   ENDIF()

commit e1ba2ed4bd0b057cca0a04c431d5ff8157eb3e44
Author: John Ralls <jralls at ceridwen.us>
Date:   Wed Sep 6 14:51:26 2017 -0700

    Append to string the pre-cmake-3.4 way.

diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
index 69ce8d9..b83d022 100644
--- a/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -105,7 +105,7 @@ FUNCTION(MAKE_GNUCASH_POTFILES)
   # here so it is easier for me to compare to the autotools
   # generated POTFILES.in
   STRING(REPLACE ";" "\n" SORT_IN "${FILES}")
-  STRING(APPEND SORT_IN "\n")
+  SET(SORT_IN "${SORT_IN}\n")
   FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/POTFILES.in.in "${SORT_IN}")
 
   EXECUTE_PROCESS(COMMAND "${PERL_EXECUTABLE}" "${CMAKE_SOURCE_DIR}/util/elegant-sort.pl"



Summary of changes:
 CMakeLists.txt                               | 4 ++--
 libgnucash/core-utils/gnc-filepath-utils.cpp | 3 +++
 po/CMakeLists.txt                            | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)