aaaahahahaha maeeeeragae
This commit is contained in:
@@ -13,17 +13,10 @@ set(SOURCE_DIR ../src)
|
||||
|
||||
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}/output)
|
||||
include_directories(${SOURCE_DIR}/lib)
|
||||
include_directories(${SOURCE_DIR}/utilities)
|
||||
>>>>>>> 1f0fd916cc2f3e7edd60b5dc45f16f825c6f06db
|
||||
|
||||
file(GLOB SOURCES "src/*/*.cpp")
|
||||
|
||||
|
||||
Reference in New Issue
Block a user