Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 12:37:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove extraneous add dependency for FIXUP_LIB

Browse source
This commit is contained in:
Stephen Birarda 2016-01-06 18:01:54 -08:00
parent 817d651c47
commit 4f00982724
2 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cmake/macros/TargetSixense.cmake
View file

@ -1,14 +1,14 @@
# #
# Copyright 2015 High Fidelity, Inc. # Copyright 2015 High Fidelity, Inc.
# Created by Bradley Austin Davis on 2015/10/10 # Created by Bradley Austin Davis on 2015/10/10
# #
# Distributed under the Apache License, Version 2.0. # Distributed under the Apache License, Version 2.0.
# See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html # See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
# #
macro(TARGET_SIXENSE) macro(TARGET_SIXENSE)
add_dependency_external_projects(sixense) add_dependency_external_projects(sixense)
find_package(Sixense REQUIRED) find_package(Sixense REQUIRED)
target_include_directories(${TARGET_NAME} PRIVATE ${SIXENSE_INCLUDE_DIRS}) target_include_directories(${TARGET_NAME} PRIVATE ${SIXENSE_INCLUDE_DIRS})
target_link_libraries(${TARGET_NAME} ${SIXENSE_LIBRARIES}) target_link_libraries(${TARGET_NAME} ${SIXENSE_LIBRARIES})
add_definitions(-DHAVE_SIXENSE) add_definitions(-DHAVE_SIXENSE)
endmacro() endmacro()

4
interface/CMakeLists.txt
View file

@ -122,10 +122,6 @@ endif()
target_include_directories(${TARGET_NAME} PRIVATE "${CMAKE_BINARY_DIR}/includes") target_include_directories(${TARGET_NAME} PRIVATE "${CMAKE_BINARY_DIR}/includes")
# These are external plugins, but we need to do the 'add dependency' here so that their
# binary directories get added to the fixup path
add_dependency_external_projects(sixense)
add_dependency_external_projects(sdl2)
if (WIN32) if (WIN32)
add_dependency_external_projects(OpenVR) add_dependency_external_projects(OpenVR)
endif() endif()