gnucash maint: Fix python build and test errors on Mac.

John Ralls jralls at code.gnucash.org
Tue Nov 21 16:30:28 EST 2017


Updated	 via  https://github.com/Gnucash/gnucash/commit/1674eb0b (commit)
	from  https://github.com/Gnucash/gnucash/commit/af1bc450 (commit)



commit 1674eb0bd49d38ce9ddde059a59527d6f2400f8a
Author: John Ralls <jralls at ceridwen.us>
Date:   Tue Nov 21 13:30:17 2017 -0800

    Fix python build and test errors on Mac.

diff --git a/src/app-utils/CMakeLists.txt b/src/app-utils/CMakeLists.txt
index bda7847..e093b82 100644
--- a/src/app-utils/CMakeLists.txt
+++ b/src/app-utils/CMakeLists.txt
@@ -108,7 +108,7 @@ INSTALL(TARGETS gncmod-app-utils
 IF (WITH_PYTHON)
   ADD_LIBRARY (gncmod-app-utils-python ${app_utils_ALL_SOURCES} ${SWIG_APP_UTILS_PYTHON_C})
 
-  TARGET_LINK_LIBRARIES(gncmod-app-utils-python ${app_utils_ALL_LIBRARIES} ${PYTHON_LIBRARIES})
+  TARGET_LINK_LIBRARIES(gncmod-app-utils-python gncmod-app-utils ${app_utils_ALL_LIBRARIES} ${PYTHON_LIBRARIES})
 
   TARGET_INCLUDE_DIRECTORIES (gncmod-app-utils-python
     PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
diff --git a/src/optional/python-bindings/CMakeLists.txt b/src/optional/python-bindings/CMakeLists.txt
index 92ea1d8..e87c194 100644
--- a/src/optional/python-bindings/CMakeLists.txt
+++ b/src/optional/python-bindings/CMakeLists.txt
@@ -95,7 +95,7 @@ IF(WITH_PYTHON)
     DEPENDS ${SWIG_GNUCASH_CORE_C})
 
   ADD_CUSTOM_TARGET(gnucash-core-c-build ALL
-    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/lib/gnucash/_gnucash_core_c${CMAKE_SHARED_LIBRARY_SUFFIX} ${PYTHON_SYSCONFIG_BUILD}/gnucash
+    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/lib/gnucash/_gnucash_core_c${CMAKE_SHARED_MODULE_SUFFIX} ${PYTHON_SYSCONFIG_BUILD}/gnucash
     DEPENDS gnucash_core_c)
     
 ENDIF()
diff --git a/src/optional/python-bindings/sqlite3test.c b/src/optional/python-bindings/sqlite3test.c
index e22d74b..20d96ae 100644
--- a/src/optional/python-bindings/sqlite3test.c
+++ b/src/optional/python-bindings/sqlite3test.c
@@ -20,9 +20,10 @@
 
 #include "config.h"
 #include "qofsession.h"
-
+#define TESTFILE "/tmp/blah.gnucash"
 int main()
 {
+    const char* testurl = "sqlite3://" TESTFILE;
     qof_log_init();
     qof_init();
     gnc_module_system_init();
@@ -30,9 +31,10 @@ int main()
     gnc_engine_init(0, no_args);
 
     QofSession * s = qof_session_new();
-    qof_session_begin(s, "sqlite3:///tmp/blah.gnucash", 0, 1, 0);
+    qof_session_begin(s, testurl, 0, 1, 0);
     qof_session_load(s, NULL);
     qof_session_save(s, NULL);
     qof_session_end(s);
+    unlink(TESTFILE);
     return 0;
 }



Summary of changes:
 src/app-utils/CMakeLists.txt                | 2 +-
 src/optional/python-bindings/CMakeLists.txt | 2 +-
 src/optional/python-bindings/sqlite3test.c  | 6 ++++--
 3 files changed, 6 insertions(+), 4 deletions(-)



More information about the gnucash-changes mailing list