Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-07 23:50:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #286 from birarda/master

Browse source 
revert the last change
This commit is contained in:
birarda 2013-05-10 15:06:06 -07:00
commit d43510c5bc
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/CMakeLists.txt
View file

@ -61,9 +61,6 @@ include(${QT_USE_FILE})
# run qt moc on qt-enabled headers # run qt moc on qt-enabled headers
qt4_wrap_cpp(INTERFACE_SRCS src/Application.h) qt4_wrap_cpp(INTERFACE_SRCS src/Application.h)
find_package(LibOVR)
target_link_libraries(${TARGET_NAME} ${LIBOVR_LIBRARY})
# create the executable, make it a bundle on OS X # create the executable, make it a bundle on OS X
add_executable(${TARGET_NAME} MACOSX_BUNDLE ${INTERFACE_SRCS}) add_executable(${TARGET_NAME} MACOSX_BUNDLE ${INTERFACE_SRCS})
@ -78,6 +75,7 @@ link_hifi_library(avatars ${TARGET_NAME} ${ROOT_DIR})
# find required libraries # find required libraries
find_package(GLM REQUIRED) find_package(GLM REQUIRED)
find_package(LodePNG REQUIRED) find_package(LodePNG REQUIRED)
find_package(LibOVR)
# include headers for external libraries and InterfaceConfig. # include headers for external libraries and InterfaceConfig.
include_directories( include_directories(
@ -89,6 +87,7 @@ include_directories(
) )
target_link_libraries(${TARGET_NAME} ${QT_LIBRARIES}) target_link_libraries(${TARGET_NAME} ${QT_LIBRARIES})
target_link_libraries(${TARGET_NAME} ${LIBOVR_LIBRARY})
if (APPLE) if (APPLE)
# link in required OS X frameworks and include the right GL headers # link in required OS X frameworks and include the right GL headers