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 branch 'maint'

Browse Source
This commit is contained in:
Christopher Lam
2019-07-25 20:30:32 +08:00
parent 63f484c555 7c9d5ee7ee
commit 720f176417
14 changed files with 821 additions and 680 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/cmake_modules/GncAddTest.cmake
View File

@@ -140,7 +140,7 @@ function(gnc_gtest_configure)
find_package(Threads REQUIRED)
set(GTEST_FOUND YES CACHE INTERNAL "Found GTest")
if(GTEST_SHARED_LIB)
set(GTEST_LIB "${GTEST_SHARED_LIB};${GTEST_MAIN_LIB}" PARENT_SCOPE)
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)