HCoop / jackhill / guix / guix.git / blame
| Commit | Line | Data |
|---|---|---|
| 89c34f5e MC |
1 | From f95925afef451755fc1449e57fbfdc2e7277f4b4 Mon Sep 17 00:00:00 2001 |
| 2 | From: Maxim Cournoyer <maxim.cournoyer@gmail.com> | |
| 3 | Date: Sat, 11 Jan 2020 00:44:55 -0500 | |
| 4 | Subject: [PATCH 1/3] tests: Link against GLib. | |
| 5 | ||
| 6 | This resolves an error about not finding <glib.h> when linking the | |
| 7 | tests that make use of GLib. | |
| 8 | ||
| 9 | * src/tests/CMakeLists.txt[2GEOM_GTESTS_SRC]: Add the glib library to | |
| 10 | the link target libraries. | |
| 11 | --- | |
| 12 | src/tests/CMakeLists.txt | 6 ++++-- | |
| 13 | 1 file changed, 4 insertions(+), 2 deletions(-) | |
| 14 | ||
| 15 | diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt | |
| 16 | index 5ddf7f9c..626cfd87 100644 | |
| 17 | --- a/src/tests/CMakeLists.txt | |
| 18 | +++ b/src/tests/CMakeLists.txt | |
| 19 | @@ -32,8 +32,10 @@ sbasis-test | |
| 20 | ||
| 21 | foreach(source ${2GEOM_GTESTS_SRC}) | |
| 22 | add_executable(${source} ${source}.cpp) | |
| 23 | - target_include_directories(${source} PRIVATE ${GSL_INCLUDE_DIRS} ${GTK3_INCLUDE_DIRS}) | |
| 24 | - target_link_libraries(${source} 2geom gtest_main gtest ${GSL_LIBRARIES} ${GTK3_LIBRARIES}) | |
| 25 | + target_include_directories(${source} PRIVATE ${GSL_INCLUDE_DIRS} | |
| 26 | + ${GTK3_INCLUDE_DIRS} ${GLIB_INCLUDE_DIRS}) | |
| 27 | + target_link_libraries(${source} 2geom gtest_main gtest ${GSL_LIBRARIES} | |
| 28 | + ${GTK3_LIBRARIES} ${GLIB_LIBRARIES}) | |
| 29 | add_test(NAME ${source} COMMAND ${source}) | |
| 30 | endforeach() | |
| 31 | ||
| 32 | -- | |
| 33 | 2.24.1 | |
| 34 |