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

repair another committed conflict

Browse source
This commit is contained in:
Stephen Birarda 2016-01-07 17:06:52 -08:00
parent 6db36a3863
commit aa9e9836b4
1 changed files with 0 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
interface/CMakeLists.txt
View file

@ -208,17 +208,10 @@ if (APPLE)
target_link_libraries(${TARGET_NAME} ${OpenGL} ${AppKit}) target_link_libraries(${TARGET_NAME} ${OpenGL} ${AppKit})
<<<<<<< HEAD
# setup install of OS X interface bundle # setup install of OS X interface bundle
install(TARGETS ${TARGET_NAME} install(TARGETS ${TARGET_NAME}
BUNDLE DESTINATION ${INTERFACE_INSTALL_DIR} BUNDLE DESTINATION ${INTERFACE_INSTALL_DIR}
COMPONENT ${CLIENT_COMPONENT} COMPONENT ${CLIENT_COMPONENT}
=======
# install command for OS X bundle
INSTALL(TARGETS ${TARGET_NAME}
BUNDLE DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/install" COMPONENT Runtime
RUNTIME DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/install" COMPONENT Runtime
>>>>>>> ebdd430... use external project hack on win only
) )
else (APPLE) else (APPLE)