gnucash maint: Multiple changes pushed
Geert Janssens
gjanssens at code.gnucash.org
Sat Sep 9 08:08:43 EDT 2017
Updated via https://github.com/Gnucash/gnucash/commit/739ce35f (commit)
via https://github.com/Gnucash/gnucash/commit/8efe0f83 (commit)
from https://github.com/Gnucash/gnucash/commit/f27d7774 (commit)
commit 739ce35f6a5c1fbd4ef7c063059d45971850ccd6
Author: Rob Gowin <robgowin at gmail.com>
Date: Fri Sep 8 11:54:17 2017 -0500
Fix problems that occur when running out of CMake build dir
diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
index 847c5b7..b3dfb98 100644
--- a/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -27,7 +27,7 @@ SET_LOCAL_DIST(po_DIST_local ${po_SOURCES} CMakeLists.txt ChangeLog Makevars POT
SET(po_DIST ${po_DIST_local} ${po_glossary_DIST} PARENT_SCOPE)
FOREACH(lingua ${ALL_LINGUAS})
- SET(_OUTPUT_FILE ${lingua}.gmo)
+ SET(_OUTPUT_FILE ${lingua}.mo)
LIST(APPEND CATALOGS ${_OUTPUT_FILE})
ADD_CUSTOM_COMMAND(
OUTPUT ${_OUTPUT_FILE}
@@ -35,11 +35,11 @@ FOREACH(lingua ${ALL_LINGUAS})
)
SET(_BUILD_FILE_DIR ${DATADIR_BUILD}/locale/${lingua}/LC_MESSAGES)
MAKE_DIRECTORY(${_BUILD_FILE_DIR})
- SET(_BUILD_FILE ${_BUILD_FILE_DIR}/gnucash.gmo)
+ SET(_BUILD_FILE ${_BUILD_FILE_DIR}/gnucash.mo)
LIST(APPEND BUILD_CATALOGS ${_BUILD_FILE})
ADD_CUSTOM_COMMAND(
OUTPUT ${_BUILD_FILE}
- COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/${lingua}.gmo ${_BUILD_FILE}
+ COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/${lingua}.mo ${_BUILD_FILE}
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_OUTPUT_FILE}
#APPEND
)
@@ -50,7 +50,7 @@ ADD_CUSTOM_TARGET(po-gmo-build ALL DEPENDS ${BUILD_CATALOGS})
FOREACH(lingua ${ALL_LINGUAS})
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${lingua}.gmo RENAME gnucash.mo DESTINATION share/locale/${lingua}/LC_MESSAGES)
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${lingua}.mo RENAME gnucash.mo DESTINATION share/locale/${lingua}/LC_MESSAGES)
ENDFOREACH(lingua)
diff --git a/src/gnome-search/CMakeLists.txt b/src/gnome-search/CMakeLists.txt
index 5b9b42e..50c4285 100644
--- a/src/gnome-search/CMakeLists.txt
+++ b/src/gnome-search/CMakeLists.txt
@@ -62,3 +62,9 @@ INSTALL(FILES ${gnome_search_HEADERS} DESTINATION include/gnucash)
SET(gnome_search_GLADE dialog-search.glade)
INSTALL(FILES ${gnome_search_GLADE} DESTINATION share/gnucash/gtkbuilder)
+
+FILE(COPY .
+ DESTINATION ${DATADIR_BUILD}/gnucash/gtkbuilder
+ PATTERN Makefile.* EXCLUDE
+ PATTERN CMakeLists.txt EXCLUDE)
+
commit 8efe0f83e62f4bdd4b30cb7a700fbd3f1f7253fe
Author: Rob Gowin <robgowin at gmail.com>
Date: Fri Sep 8 09:41:15 2017 -0500
Run the python bindings test when using CMake
diff --git a/src/optional/python-bindings/CMakeLists.txt b/src/optional/python-bindings/CMakeLists.txt
index 93682fb..eb1e6e9 100644
--- a/src/optional/python-bindings/CMakeLists.txt
+++ b/src/optional/python-bindings/CMakeLists.txt
@@ -63,6 +63,8 @@ IF(WITH_PYTHON)
${PYTHON_INCLUDE_DIRS}
)
+ SET(PYEXEC_FILES __init__.py function_class.py gnucash_business.py gnucash_core.py)
+
ADD_LIBRARY(gnucash_core_c MODULE ${SWIG_GNUCASH_CORE_C})
TARGET_INCLUDE_DIRECTORIES(gnucash_core_c PRIVATE ${gnucash_core_c_INCLUDE_DIRS})
@@ -101,19 +103,19 @@ IF(WITH_PYTHON)
DESTINATION ${PYTHON_SYSCONFIG_OUTPUT}/gnucash
)
+ FILE(COPY ${PYEXEC_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/gnucash)
+
+ ADD_CUSTOM_TARGET(gnucash-core-c-py ALL
+ COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/gnucash_core_c.py ${CMAKE_CURRENT_BINARY_DIR}/gnucash
+ DEPENDS ${SWIG_GNUCASH_CORE_C})
+
ENDIF()
-SET(python_bindings_DATA
- __init__.py
- function_class.py
- gnucash_business.py
+SET(python_bindings_DATA ${PYEXEC_FILES}
gnucash_core.i
- gnucash_core.py
sqlite3test.c
timespec.i)
SET_LOCAL_DIST(python_bindings_DIST_local CMakeLists.txt Makefile.am ${python_bindings_DATA})
-SET(python_bindings_DIST ${python_bindings_DIST_local} ${test_python_bindings_DIST} ${example_scripts_DIST} PARENT_SCOPE)
-
-
+SET(python_bindings_DIST ${python_bindings_DIST_local} ${test_python_bindings_DIST} ${example_scripts_DIST} PARENT_SCOPE)
\ No newline at end of file
diff --git a/src/optional/python-bindings/tests/CMakeLists.txt b/src/optional/python-bindings/tests/CMakeLists.txt
index e3074d0..f900fa1 100644
--- a/src/optional/python-bindings/tests/CMakeLists.txt
+++ b/src/optional/python-bindings/tests/CMakeLists.txt
@@ -1,4 +1,12 @@
+IF (WITH_PYTHON)
+ ADD_TEST(python-bindings ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/runTests.py.in)
+ SET_PROPERTY(TEST python-bindings PROPERTY ENVIRONMENT
+ GNC_BUILDDIR=${CMAKE_BINARY_DIR}
+ PYTHONPATH=${CMAKE_BINARY_DIR}/src/optional/python-bindings:${CMAKE_BINARY_DIR}/lib/gnucash:${CMAKE_BINARY_DIR}/src/test-core
+ )
+ENDIF()
+
SET(test_python_bindings_DATA
runTests.py.in
test_account.py
Summary of changes:
po/CMakeLists.txt | 8 ++++----
src/gnome-search/CMakeLists.txt | 6 ++++++
src/optional/python-bindings/CMakeLists.txt | 18 ++++++++++--------
src/optional/python-bindings/tests/CMakeLists.txt | 8 ++++++++
4 files changed, 28 insertions(+), 12 deletions(-)
More information about the gnucash-changes
mailing list