diff options
| -rw-r--r-- | proto-fsuipc/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | proto-simconnect/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | proto-vjoystick/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tracker-hydra/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tracker-rs/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tracker-steamvr/CMakeLists.txt | 4 |
6 files changed, 7 insertions, 7 deletions
diff --git a/proto-fsuipc/CMakeLists.txt b/proto-fsuipc/CMakeLists.txt index 536a92ab..bb613d1d 100644 --- a/proto-fsuipc/CMakeLists.txt +++ b/proto-fsuipc/CMakeLists.txt @@ -1,4 +1,4 @@ -if(WIN32) +if(WIN32 AND NOT opentrack-64bit AND opentrack-intel) set(SDK_FSUIPC "" CACHE PATH "FSUIPC for older MS FSX path") if(SDK_FSUIPC) otr_module(proto-fsuipc) diff --git a/proto-simconnect/CMakeLists.txt b/proto-simconnect/CMakeLists.txt index 26047b6f..f5cec5ac 100644 --- a/proto-simconnect/CMakeLists.txt +++ b/proto-simconnect/CMakeLists.txt @@ -1,3 +1,3 @@ -if(WIN32) +if(WIN32 AND opentrack-intel) otr_module(proto-simconnect) endif() diff --git a/proto-vjoystick/CMakeLists.txt b/proto-vjoystick/CMakeLists.txt index 41af2883..3dbf5bea 100644 --- a/proto-vjoystick/CMakeLists.txt +++ b/proto-vjoystick/CMakeLists.txt @@ -1,4 +1,4 @@ -if(WIN32) +if(WIN32 AND opentrack-intel) set(SDK_VJOYSTICK "" CACHE PATH "vjoystick SDK path") if(SDK_VJOYSTICK) if(opentrack-64bit) diff --git a/tracker-hydra/CMakeLists.txt b/tracker-hydra/CMakeLists.txt index 2e263a19..b99c1d7a 100644 --- a/tracker-hydra/CMakeLists.txt +++ b/tracker-hydra/CMakeLists.txt @@ -1,5 +1,5 @@ set(SDK_HYDRA "" CACHE PATH "libSixense path for Razer Hydra") -if(SDK_HYDRA) +if(SDK_HYDRA AND opentrack-intel) otr_module(tracker-hydra) target_include_directories(opentrack-tracker-hydra SYSTEM PUBLIC ${SDK_HYDRA}/include ${SDK_HYDRA}/include/sixense_utils) if(opentrack-64bit) diff --git a/tracker-rs/CMakeLists.txt b/tracker-rs/CMakeLists.txt index fc8eb75b..8350c551 100644 --- a/tracker-rs/CMakeLists.txt +++ b/tracker-rs/CMakeLists.txt @@ -1,6 +1,6 @@ set(SDK_REALSENSE "$ENV{RSSDK_DIR}" CACHE PATH "Intel RealSense SDK dir") -if(WIN32 AND SDK_REALSENSE) +if(WIN32 AND SDK_REALSENSE AND opentrack-intel) if(CMAKE_COMPILER_IS_GNUCC) add_definitions(-fpermissive -Wno-error) # for SDK headers endif() diff --git a/tracker-steamvr/CMakeLists.txt b/tracker-steamvr/CMakeLists.txt index 512a49ff..8d14880c 100644 --- a/tracker-steamvr/CMakeLists.txt +++ b/tracker-steamvr/CMakeLists.txt @@ -24,13 +24,13 @@ if(APPLE AND NOT opentrack-64bit) set(steamvr-lib "${steamvr-dll}") endif() -if(steamvr-dll) +if(steamvr-dll AND opentrack-intel) SET(SDK_VALVE_STEAMVR "" CACHE PATH "Valve's SteamVR") if(SDK_VALVE_STEAMVR) otr_module(tracker-steamvr) install(FILES "${SDK_VALVE_STEAMVR}/bin/${steamvr-dir}/${steamvr-dll}" DESTINATION "${opentrack-hier-pfx}") - target_include_directories(opentrack-tracker-steamvr SYSTEM PUBLIC "${SDK_VALVE_STEAMVR}/headers") + target_include_directories(opentrack-tracker-steamvr SYSTEM PRIVATE "${SDK_VALVE_STEAMVR}/headers") target_link_libraries(opentrack-tracker-steamvr "${SDK_VALVE_STEAMVR}/lib/${steamvr-dir}/${steamvr-lib}") endif() endif() |