gnucash maint: Bug 795251 - googletest detection cannot be overridden

John Ralls jralls at code.gnucash.org
Sat Jul 20 21:05:24 EDT 2019


Updated	 via  https://github.com/Gnucash/gnucash/commit/507ef68d (commit)
	from  https://github.com/Gnucash/gnucash/commit/aa95d61c (commit)



commit 507ef68dc7cabed6ed257c36c78d8d34711682e7
Author: Thomas Klausner <tk at giga.or.at>
Date:   Sat Jul 20 18:05:13 2019 -0700

    Bug 795251 - googletest detection cannot be overridden
    
    For the part about the GTest linking problem.

diff --git a/common/cmake_modules/GncAddTest.cmake b/common/cmake_modules/GncAddTest.cmake
index 10151eaf0..b5f4162f3 100644
--- a/common/cmake_modules/GncAddTest.cmake
+++ b/common/cmake_modules/GncAddTest.cmake
@@ -126,7 +126,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)



Summary of changes:
 common/cmake_modules/GncAddTest.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)



More information about the gnucash-changes mailing list