mirror of
https://github.com/JulianGro/overte.git
synced 2025-04-25 17:14:59 +02:00
resolve conflicts on merge with upstream master
This commit is contained in:
parent
9ee3f889ab
commit
a059e44011
1 changed files with 0 additions and 3 deletions
|
@ -86,9 +86,6 @@ include_directories(
|
|||
${LIBOVR_INCLUDE_DIRS}
|
||||
)
|
||||
|
||||
find_package(Qt4 REQUIRED QtCore QtGui)
|
||||
include(${QT_USE_FILE})
|
||||
|
||||
target_link_libraries(${TARGET_NAME} ${QT_LIBRARIES} ${LIBOVR_LIBRARY})
|
||||
|
||||
if (APPLE)
|
||||
|
|
Loading…
Reference in a new issue