From 0a1a0e9df00f37a210b67a11cf8f99550cafeeaf Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Thu, 25 Oct 2018 03:11:42 +0200
Subject: cleanups only

---
 tracker-hydra/CMakeLists.txt | 36 +++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 15 deletions(-)

(limited to 'tracker-hydra')

diff --git a/tracker-hydra/CMakeLists.txt b/tracker-hydra/CMakeLists.txt
index af44135f..2e263a19 100644
--- a/tracker-hydra/CMakeLists.txt
+++ b/tracker-hydra/CMakeLists.txt
@@ -15,23 +15,29 @@ if(SDK_HYDRA)
             set(dir bin)
             set(ext dll)
         endif()
-        set(under_dll _dll)
-        set(soext dll)
-        target_link_libraries(opentrack-tracker-hydra "${SDK_HYDRA}/${dir}/win32/release_dll/sixense.${ext}")
-        install(FILES "${SDK_HYDRA}/bin/win32/release_dll/sixense.dll" DESTINATION ${opentrack-hier-pfx} PERMISSIONS ${opentrack-perms-exec})
+        if (opentrack-64bit)
+            set(part "x64")
+        else()
+            set(part "win32")
+        endif()
+        set(lib "${SDK_HYDRA}/${dir}/${part}/release_dll/sixense${six4}.${ext}")
+        set(dll "${SDK_HYDRA}/bin/${part}/release_dll/sixense${six4}.dll")
+        install(FILES "${dll}" DESTINATION ${opentrack-hier-pfx} PERMISSIONS ${opentrack-perms-exec})
+        target_link_libraries(opentrack-tracker-hydra "${lib}")
     else()
         if(APPLE)
-            set(dest .)
-            set(under-dll _dll)
-            set(soext dylib)
-            set(plat osx)
-        else()
-            set(dest ${opentrack-hier-pfx})
-            set(under-dll)
-            set(soext so)
-            set(plat linux)
+            set(dest ".")
+            set(part "release_dll")
+            set(soext "dylib")
+            set(plat "osx")
+        else() # assume Linux
+            set(dest "${opentrack-hier-pfx}")
+            set(part "release")
+            set(soext "so")
+            set(plat "linux")
         endif()
-        target_link_libraries(opentrack-tracker-hydra "${SDK_HYDRA}/lib/${plat}${six4}/release${under-dll}/libsixense${six4}.${soext}")
-        install(FILES "${SDK_HYDRA}/lib/${plat}${six4}/release${under-dll}/libsixense${six4}.${soext}" DESTINATION ${opentrack-hier-pfx} PERMISSIONS ${opentrack-perms-exec})
+        set(lib "libsixense${six4}.${soext}")
+        target_link_libraries(opentrack-tracker-hydra "${SDK_HYDRA}/lib/${plat}${six4}/${part}/${lib}")
+        install(FILES "${SDK_HYDRA}/lib/${plat}${six4}/${part}/${lib}" DESTINATION ${opentrack-hier-pfx} PERMISSIONS ${opentrack-perms-exec})
     endif()
 endif()
-- 
cgit v1.2.3