From 3cd6a5a8b54686575f89e10eea75976bda3bac2f Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Fri, 12 Jun 2015 05:37:54 +0200 Subject: cmake: no -fipa-pta workaround needed, compiler fix is known See --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index f9da7d36..55f715b6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -321,7 +321,7 @@ if(OpenCV_FOUND) link_with_dinput8(opentrack-tracker-pt) if(SDK_ARUCO_LIBPATH) - opentrack_library(opentrack-tracker-aruco ftnoir_tracker_aruco GNU-LINK -fno-ipa-pta) + opentrack_library(opentrack-tracker-aruco ftnoir_tracker_aruco) target_link_libraries(opentrack-tracker-aruco ${SDK_ARUCO_LIBPATH} ${OpenCV_LIBS}) target_include_directories(opentrack-tracker-aruco SYSTEM PUBLIC ${OpenCV_INCLUDE_DIRS}) endif() -- cgit v1.2.3 From 524760a5248760307e99b396e2d4c9f7e4f74563 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Mon, 15 Jun 2015 07:40:02 +0200 Subject: cmake: nix stderr spam on older version --- CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 55f715b6..7bbdb26c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,9 @@ project(opentrack) cmake_minimum_required(VERSION 2.8.11) cmake_policy(SET CMP0020 NEW) -cmake_policy(SET CMP0058 OLD) +if(POLICY CMP0058) + cmake_policy(SET CMP0058 OLD) +endif() include(CMakeParseArguments) -- cgit v1.2.3 From 14ca2dd62ae8f065929e9aa536ac361b1265692a Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Mon, 15 Jun 2015 07:40:26 +0200 Subject: cmake: adjust vjoy.dll/sixense.dll permissions to avoid EACCES on loading on win32 --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 7bbdb26c..4413f712 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -370,7 +370,7 @@ if(SDK_HYDRA) ) install(FILES "${SDK_HYDRA}/bin/win32/release_dll/sixense.dll" #"${SDK_HYDRA}/bin/win32/release_dll/sixense_utils.dll" - DESTINATION .) + DESTINATION . PERMISSIONS WORLD_READ WORLD_EXECUTE OWNER_WRITE OWNER_READ OWNER_EXECUTE) else() if(SDK_HYDRA_AMD64) set(underscore-sixtyfour _x64) @@ -481,7 +481,7 @@ endif() install(TARGETS opentrack DESTINATION .) if(SDK_VJOY) - install(FILES "${SDK_VJOY}/VJoy.dll" DESTINATION .) + install(FILES "${SDK_VJOY}/VJoy.dll" DESTINATION . PERMISSIONS WORLD_READ WORLD_EXECUTE OWNER_WRITE OWNER_READ OWNER_EXECUTE) endif() if(WIN32) -- cgit v1.2.3