rhetenor/flippr-code
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

aaaahahahaha maeeeeragae

Browse Source
This commit is contained in:
Jonas Zeunert
2018-06-07 23:31:21 +02:00
parent cab74abe84
commit a5b43fd544
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
FlippR-Driver/build/CMakeLists.txt
View File

@@ -13,17 +13,10 @@ set(SOURCE_DIR ../src)
find_package(Threads) find_package(Threads)
<<<<<<< HEAD
include_directories(../src/input)
include_directories(output)
include_directories(lib)
include_directories(tests)
=======
include_directories(${SOURCE_DIR}/input) include_directories(${SOURCE_DIR}/input)
include_directories(${SOURCE_DIR}/output) include_directories(${SOURCE_DIR}/output)
include_directories(${SOURCE_DIR}/lib) include_directories(${SOURCE_DIR}/lib)
include_directories(${SOURCE_DIR}/utilities) include_directories(${SOURCE_DIR}/utilities)
>>>>>>> 1f0fd916cc2f3e7edd60b5dc45f16f825c6f06db
file(GLOB SOURCES "src/*/*.cpp") file(GLOB SOURCES "src/*/*.cpp")