From e324873fefce3a6aef8919861cf17862d1645823 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Wed, 10 Jun 2015 12:13:25 +0200 Subject: cmake: link sixense dynamically for hydra Previously, .dll was included anyway despite static link. There's a binutils 2.25 bug breaking linking against that sixense.lib, and binutils HEAD has LTO breakage instead. We don't need sixense_utils so remove that from build. --- CMakeLists.txt | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index fcbc266f..4118d9d7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -367,9 +367,12 @@ if(SDK_HYDRA) target_include_directories(opentrack-tracker-hydra SYSTEM PUBLIC ${SDK_HYDRA}/include ${SDK_HYDRA}/include/sixense_utils) if(WIN32) target_link_libraries(opentrack-tracker-hydra - "${SDK_HYDRA}/lib/win32/release_dll/sixense.lib" - "${SDK_HYDRA}/lib/win32/release_dll/sixense_utils.lib") - install(FILES "${SDK_HYDRA}/bin/win32/release_dll/sixense.dll" "${SDK_HYDRA}/bin/win32/release_dll/sixense_utils.dll" DESTINATION .) + "${SDK_HYDRA}/bin/win32/release_dll/sixense.dll" + #"${SDK_HYDRA}/bin/win32/release_dll/sixense_utils.dll" + ) + install(FILES "${SDK_HYDRA}/bin/win32/release_dll/sixense.dll" + #"${SDK_HYDRA}/bin/win32/release_dll/sixense_utils.dll" + DESTINATION .) else() if(SDK_HYDRA_AMD64) set(underscore-sixtyfour _x64) @@ -387,10 +390,13 @@ if(SDK_HYDRA) endif() install(FILES "${SDK_HYDRA}/lib/${sixense-plat}${underscore-sixtyfour}/release${underscore-dll}/libsixense${underscore-sixtyfour}.${soext}" - "${SDK_HYDRA}/lib/${sixense-plat}${underscore-sixtyfour}/release${underscore-dll}/libsixense_utils${underscore-sixtyfour}.${soext}" + #"${SDK_HYDRA}/lib/${sixense-plat}${underscore-sixtyfour}/release${underscore-dll}/libsixense_utils${underscore-sixtyfour}.${soext}" DESTINATION . ) - target_link_libraries(opentrack-tracker-hydra "${SDK_HYDRA}/lib/${sixense-plat}${underscore-sixtyfour}/release${underscore-dll}/libsixense${underscore-sixtyfour}.${soext}" "${SDK_HYDRA}/lib/${sixense-plat}${underscore-sixtyfour}/release${underscore-dll}/libsixense_utils${underscore-sixtyfour}.${soext}") + target_link_libraries(opentrack-tracker-hydra + "${SDK_HYDRA}/lib/${sixense-plat}${underscore-sixtyfour}/release${underscore-dll}/libsixense${underscore-sixtyfour}.${soext}" + #"${SDK_HYDRA}/lib/${sixense-plat}${underscore-sixtyfour}/release${underscore-dll}/libsixense_utils${underscore-sixtyfour}.${soext}" + ) endif() endif() -- cgit v1.2.3