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

remove accidentally committed conflict

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

3
interface/CMakeLists.txt
View file

@ -107,11 +107,8 @@ else()
add_executable(${TARGET_NAME} ${INTERFACE_SRCS} ${QM})
endif()
<<<<<<< HEAD
target_include_directories(${TARGET_NAME} PRIVATE "${CMAKE_BINARY_DIR}/includes")
=======
>>>>>>> ebdd430... use external project hack on win only
if (WIN32)
# These are external plugins, but we need to do the 'add dependency' here so that their
# binary directories get added to the fixup path