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

Ubuntu 18.04 requires explicit link to pthreads.

Browse Source
This commit is contained in:
John Ralls
2019-09-14 11:49:12 -07:00
parent 1a9fcfefad
commit 76979554a0
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@@ -192,6 +192,7 @@ if (WIN32)
set(CMAKE_EXE_LINKER_FLAGS -mwindows) set(CMAKE_EXE_LINKER_FLAGS -mwindows)
endif(WIN32) endif(WIN32)
find_package(Threads REQUIRED)
find_package(PkgConfig REQUIRED) find_package(PkgConfig REQUIRED)
if (NOT PKG_CONFIG_FOUND) if (NOT PKG_CONFIG_FOUND)

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

@@ -22,7 +22,7 @@ set_dist_list(test_core_DIST ${test_core_SOURCES} ${test_core_noinst_HEADERS} CM
unittest-support.i unittest-support.scm) unittest-support.i unittest-support.scm)
add_library(test-core STATIC ${test_core_SOURCES} ${test_core_noinst_HEADERS}) add_library(test-core STATIC ${test_core_SOURCES} ${test_core_noinst_HEADERS})
target_link_libraries(test-core gncmod-engine ${GLIB2_LDFLAGS}) target_link_libraries(test-core gncmod-engine PkgConfig::GLIB2)
if (UNIX) if (UNIX)
target_compile_options(test-core PRIVATE -fPIC) target_compile_options(test-core PRIVATE -fPIC)
endif() endif()
@@ -41,7 +41,7 @@ gnc_add_swig_python_command (swig-unittest-support-python
) )
add_library(test-core-guile ${SWIG_UNITTEST_SUPPORT_GUILE_C}) add_library(test-core-guile ${SWIG_UNITTEST_SUPPORT_GUILE_C})
target_link_libraries(test-core-guile test-core ${GUILE_LDFLAGS} ${GLIB2_LDFLAGS}) target_link_libraries(test-core-guile test-core PkgConfig::GUILE PkgConfig::GLIB2)
if (WITH_PYTHON) if (WITH_PYTHON)
add_library(unittest_support MODULE ${SWIG_UNITTEST_SUPPORT_PYTHON_C}) add_library(unittest_support MODULE ${SWIG_UNITTEST_SUPPORT_PYTHON_C})
@@ -81,6 +81,7 @@ if (GTEST_SRC_DIR)
else() else()
target_compile_options(gtest PRIVATE -Wno-missing-declarations) target_compile_options(gtest PRIVATE -Wno-missing-declarations)
endif() endif()
target_link_libraries(gtest Threads::Threads)
target_include_directories(gtest PUBLIC ${GTEST_INCLUDE_DIR} ${GTEST_SRC_DIR}) target_include_directories(gtest PUBLIC ${GTEST_INCLUDE_DIR} ${GTEST_SRC_DIR})
else() else()
add_library(gtest UNKNOWN IMPORTED GLOBAL) add_library(gtest UNKNOWN IMPORTED GLOBAL)