IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge maint

Browse Source
This commit is contained in:
Geert Janssens
2019-08-17 12:53:55 +02:00
parent d1fddf557c e4de6a3198
commit 0e93e95c6c
29 changed files with 26373 additions and 25745 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
common/cmake_modules/GncAddTest.cmake
View File

@@ -143,7 +143,10 @@ function(gnc_gtest_configure)
set(GTEST_LIB "${GTEST_MAIN_LIB};${GTEST_SHARED_LIB}" PARENT_SCOPE)
unset(GTEST_SRC_DIR CACHE)
else()
set(GTEST_SRC "${GTEST_SRC_DIR}/src/gtest_main.cc" PARENT_SCOPE)
set(lib_gtest_SOURCES
"${GTEST_SRC_DIR}/src/gtest_main.cc"
"${GTEST_SRC_DIR}/src/gtest-all.cc"
PARENT_SCOPE)
set(GTEST_LIB "${CMAKE_BINARY_DIR}/common/test-core/libgtest.a" PARENT_SCOPE)
endif()
else()

3
common/config.h.cmake.in
View File

@@ -363,6 +363,9 @@
#cmakedefine WEBKIT2_3 1
#cmakedefine WEBKIT1 1
/* Definition for AQBanking Runtime Config feature */
#cmakedefine AQB_HAS_RUNTIME_CONFIG 1
/* Definitions for all OS */
/* From cutecash */
//#define HAVE_LIBQOF /**/

3
common/test-core/CMakeLists.txt
View File

@@ -73,7 +73,8 @@ gnc_add_scheme_deprecated_module ("gnucash unittest-support" "tests unittest-sup
if(NOT GTEST_SHARED_LIB)
set (lib_gtest_SOURCES ${GTEST_SRC_DIR}/src/gtest-all.cc)
# in contrast to GoogleTest build system libraries libgtest.a and libgtest_main.a
# are combined to one library libtest.a here
add_library(gtest STATIC ${lib_gtest_SOURCES})
if(APPLE)
target_compile_options(gtest PRIVATE -Wno-missing-prototypes)