From: Michael Sartain <mikesart@gmail.com>
Date: Fri, 14 Mar 2014 15:51:14 +0000 (-0700)
Subject: Merge pull request #5 from andrewkww/fix_vogleditor_link
X-Git-Url: https://git.cworth.org/git?p=vogl;a=commitdiff_plain;h=5dfa02621fbdbae34adfd4e25faad0268f6a198a;hp=3abc8faa5fa77d8d7606cfe5c864f53ea9859a5d

Merge pull request #5 from andrewkww/fix_vogleditor_link

Fix linking issue in vogleditor
---

diff --git a/src/voglbench/CMakeLists.txt b/src/voglbench/CMakeLists.txt
index c074e8d..db34f92 100644
--- a/src/voglbench/CMakeLists.txt
+++ b/src/voglbench/CMakeLists.txt
@@ -24,7 +24,6 @@ target_link_libraries(${PROJECT_NAME}
     voglcommon
     dl
     X11
-    pthread
     voglcore
     rt
     )
diff --git a/src/voglcore/CMakeLists.txt b/src/voglcore/CMakeLists.txt
index 9dd0f50..9b6dda1 100644
--- a/src/voglcore/CMakeLists.txt
+++ b/src/voglcore/CMakeLists.txt
@@ -105,7 +105,10 @@ else()
 endif()
 
 add_library(${PROJECT_NAME} ${SRC_LIST})
-target_link_libraries(${PROJECT_NAME} rt)
+target_link_libraries(${PROJECT_NAME}
+    pthread
+    rt
+    )
 
 build_options_finalize()
 
diff --git a/src/vogleditor/CMakeLists.txt b/src/vogleditor/CMakeLists.txt
index 2dc839e..bf2c3c6 100644
--- a/src/vogleditor/CMakeLists.txt
+++ b/src/vogleditor/CMakeLists.txt
@@ -153,6 +153,8 @@ target_link_libraries(${PROJECT_NAME}
 	backtrace
 	voglcommon
     voglcore
+    X11
+    dl
    )
 
 build_options_finalize()
diff --git a/src/voglgen/CMakeLists.txt b/src/voglgen/CMakeLists.txt
index 1ad4b86..751b5ac 100644
--- a/src/voglgen/CMakeLists.txt
+++ b/src/voglgen/CMakeLists.txt
@@ -14,7 +14,6 @@ add_executable(${PROJECT_NAME} ${SRC_LIST})
 
 target_link_libraries(${PROJECT_NAME}
     voglcore
-    pthread
     )
 
 build_options_finalize()
diff --git a/src/voglsyms/CMakeLists.txt b/src/voglsyms/CMakeLists.txt
index 8fff2cd..e3bf237 100644
--- a/src/voglsyms/CMakeLists.txt
+++ b/src/voglsyms/CMakeLists.txt
@@ -23,7 +23,6 @@ target_link_libraries(${PROJECT_NAME}
     backtrace
     voglcommon
     dl
-    pthread
     voglcore
     rt
     )
diff --git a/src/vogltest/CMakeLists.txt b/src/vogltest/CMakeLists.txt
index cb8091b..b0725b5 100644
--- a/src/vogltest/CMakeLists.txt
+++ b/src/vogltest/CMakeLists.txt
@@ -27,7 +27,6 @@ add_executable(${PROJECT_NAME} ${SRC_LIST})
 
 target_link_libraries(${PROJECT_NAME}
     voglcore
-    pthread
     X11
     ${VOGLTEST_OPENGL_LIBRARY}
     dl