Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-26 01:36:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

attempt to make LIBVPX optional since we don't yet have it on windows

Browse source
This commit is contained in:
Brad Hefta-Gaub 2014-01-11 11:47:17 -08:00
parent 91da3264eb
commit cded9a1558
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
interface/CMakeLists.txt
View file

@ -140,6 +140,17 @@ if (LIBOVR_FOUND AND NOT DISABLE_LIBOVR)
target_link_libraries(${TARGET_NAME} ${LIBOVR_LIBRARIES}) target_link_libraries(${TARGET_NAME} ${LIBOVR_LIBRARIES})
endif (LIBOVR_FOUND AND NOT DISABLE_LIBOVR) endif (LIBOVR_FOUND AND NOT DISABLE_LIBOVR)
# let the source know that we have LibVPX
if (LIBVPX_FOUND AND NOT DISABLE_LIBVPX)
add_definitions(-DHAVE_LIBVPX)
include_directories(SYSTEM ${LIBVPX_INCLUDE_DIRS})
if (APPLE OR UNIX)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${LIBVPX_INCLUDE_DIRS}")
endif (APPLE OR UNIX)
target_link_libraries(${TARGET_NAME} ${LIBVPX_LIBRARIES})
endif (LIBVPX_FOUND AND NOT DISABLE_LIBVPX)
qt5_use_modules(${TARGET_NAME} Core Gui Multimedia Network OpenGL Script Svg WebKit WebKitWidgets) qt5_use_modules(${TARGET_NAME} Core Gui Multimedia Network OpenGL Script Svg WebKit WebKitWidgets)
# include headers for interface and InterfaceConfig. # include headers for interface and InterfaceConfig.
@ -154,7 +165,6 @@ include_directories(
SYSTEM SYSTEM
${FACESHIFT_INCLUDE_DIRS} ${FACESHIFT_INCLUDE_DIRS}
${GLM_INCLUDE_DIRS} ${GLM_INCLUDE_DIRS}
${LIBVPX_INCLUDE_DIRS}
${LEAP_INCLUDE_DIRS} ${LEAP_INCLUDE_DIRS}
${MOTIONDRIVER_INCLUDE_DIRS} ${MOTIONDRIVER_INCLUDE_DIRS}
${OPENCV_INCLUDE_DIRS} ${OPENCV_INCLUDE_DIRS}
@ -167,7 +177,6 @@ endif (APPLE OR UNIX)
target_link_libraries( target_link_libraries(
${TARGET_NAME} ${TARGET_NAME}
${FACESHIFT_LIBRARIES} ${FACESHIFT_LIBRARIES}
${LIBVPX_LIBRARIES}
${MOTIONDRIVER_LIBRARIES} ${MOTIONDRIVER_LIBRARIES}
${OPENCV_LIBRARIES} ${OPENCV_LIBRARIES}
${ZLIB_LIBRARIES} ${ZLIB_LIBRARIES}