[geary/bug/776421-make-client-unit-testable: 3/8] Don't duplicate gthread library when linking.



commit 2f23f920746419e638f2637ec5dfb138cc722e0d
Author: Michael James Gratton <mike vee net>
Date:   Mon Dec 26 10:49:51 2016 +1030

    Don't duplicate gthread library when linking.

 src/CMakeLists.txt  |    8 ++++----
 test/CMakeLists.txt |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 50762a6..6db736f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -603,7 +603,7 @@ OPTIONS
 
 add_library(geary-static STATIC ${ENGINE_VALA_C})
 add_dependencies(geary-static git-version)
-target_link_libraries(geary-static ${DEPS_LIBRARIES} sqlite3-unicodesn gthread-2.0)
+target_link_libraries(geary-static ${DEPS_LIBRARIES} sqlite3-unicodesn)
 
 # WebKitGTK VAPI generation
 #################################################
@@ -635,7 +635,7 @@ OPTIONS
 )
 
 add_executable(geary ${GEARY_VALA_C} ${RESOURCES_C})
-target_link_libraries(geary m ${DEPS_LIBRARIES} gthread-2.0 geary-static)
+target_link_libraries(geary m ${DEPS_LIBRARIES} geary-static)
 install(TARGETS geary RUNTIME DESTINATION bin)
 add_custom_command(
     TARGET
@@ -665,7 +665,7 @@ OPTIONS
 )
 
 add_executable(geary-console ${CONSOLE_VALA_C})
-target_link_libraries(geary-console ${DEPS_LIBRARIES} gthread-2.0 geary-static)
+target_link_libraries(geary-console ${DEPS_LIBRARIES} geary-static)
 add_custom_command(
     TARGET
         geary-console
@@ -687,7 +687,7 @@ OPTIONS
 )
 
 add_executable(geary-mailer ${MAILER_VALA_C})
-target_link_libraries(geary-mailer ${DEPS_LIBRARIES} gthread-2.0 geary-static)
+target_link_libraries(geary-mailer ${DEPS_LIBRARIES} geary-static)
 add_custom_command(
     TARGET
         geary-mailer
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 2a82848..859e5e7 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -65,4 +65,4 @@ OPTIONS
 )
 
 add_executable(geary-test ${TEST_VALA_C})
-target_link_libraries(geary-test ${DEPS_LIBRARIES} gthread-2.0 geary-static)
+target_link_libraries(geary-test ${DEPS_LIBRARIES} geary-static)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]