asdf
This commit is contained in:
@@ -1,5 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
|
<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
|
||||||
|
<<<<<<< HEAD
|
||||||
<storageModule moduleId="org.eclipse.cdt.core.settings">
|
<storageModule moduleId="org.eclipse.cdt.core.settings">
|
||||||
<cconfiguration id="cdt.managedbuild.config.gnu.exe.debug.1796611039">
|
<cconfiguration id="cdt.managedbuild.config.gnu.exe.debug.1796611039">
|
||||||
<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.exe.debug.1796611039" moduleId="org.eclipse.cdt.core.settings" name="Debug">
|
<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.exe.debug.1796611039" moduleId="org.eclipse.cdt.core.settings" name="Debug">
|
||||||
@@ -129,4 +130,273 @@
|
|||||||
<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets">
|
<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets">
|
||||||
<buildTargets/>
|
<buildTargets/>
|
||||||
</storageModule>
|
</storageModule>
|
||||||
|
=======
|
||||||
|
|
||||||
|
<storageModule moduleId="org.eclipse.cdt.core.settings">
|
||||||
|
|
||||||
|
<cconfiguration id="cdt.managedbuild.config.gnu.exe.debug.1796611039">
|
||||||
|
|
||||||
|
<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.exe.debug.1796611039" moduleId="org.eclipse.cdt.core.settings" name="Debug">
|
||||||
|
|
||||||
|
<externalSettings/>
|
||||||
|
|
||||||
|
<extensions>
|
||||||
|
|
||||||
|
<extension id="org.eclipse.cdt.core.GNU_ELF" point="org.eclipse.cdt.core.BinaryParser"/>
|
||||||
|
|
||||||
|
<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
|
||||||
|
|
||||||
|
<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
|
||||||
|
|
||||||
|
<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
|
||||||
|
|
||||||
|
<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
|
||||||
|
|
||||||
|
<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
|
||||||
|
|
||||||
|
</extensions>
|
||||||
|
|
||||||
|
</storageModule>
|
||||||
|
|
||||||
|
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
|
||||||
|
|
||||||
|
<configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" errorParsers="org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GmakeErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.CWDLocator;org.eclipse.cdt.core.GCCErrorParser" id="cdt.managedbuild.config.gnu.exe.debug.1796611039" name="Debug" parent="cdt.managedbuild.config.gnu.exe.debug" postannouncebuildStep="" postbuildStep="" preannouncebuildStep="" prebuildStep="">
|
||||||
|
|
||||||
|
<folderInfo id="cdt.managedbuild.config.gnu.exe.debug.1796611039." name="/" resourcePath="">
|
||||||
|
|
||||||
|
<toolChain errorParsers="" id="cdt.managedbuild.toolchain.gnu.exe.debug.321199428" name="Linux GCC" nonInternalBuilderId="cdt.managedbuild.target.gnu.builder.exe.debug" superClass="cdt.managedbuild.toolchain.gnu.exe.debug">
|
||||||
|
|
||||||
|
<targetPlatform binaryParser="org.eclipse.cdt.core.GNU_ELF" id="cdt.managedbuild.target.gnu.platform.exe.debug.1396231656" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.debug"/>
|
||||||
|
|
||||||
|
<builder autoBuildTarget="all" buildPath="${workspace_loc:/FlippR-Driver}/Debug" cleanBuildTarget="clean" id="org.eclipse.cdt.build.core.internal.builder.480404628" incrementalBuildTarget="all" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="CDT Internal Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="org.eclipse.cdt.build.core.internal.builder"/>
|
||||||
|
|
||||||
|
<tool id="cdt.managedbuild.tool.gnu.archiver.base.478752077" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
|
||||||
|
|
||||||
|
<tool command="g++" commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG} ${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}" errorParsers="org.eclipse.cdt.core.GCCErrorParser" id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.496350382" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug">
|
||||||
|
|
||||||
|
<option id="gnu.cpp.compiler.exe.debug.option.optimization.level.584691682" name="Optimization Level" superClass="gnu.cpp.compiler.exe.debug.option.optimization.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
|
||||||
|
|
||||||
|
<option id="gnu.cpp.compiler.exe.debug.option.debugging.level.1858448861" name="Debug Level" superClass="gnu.cpp.compiler.exe.debug.option.debugging.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.debugging.level.max" valueType="enumerated"/>
|
||||||
|
|
||||||
|
<option id="gnu.cpp.compiler.option.dialect.std.2099880839" name="Language standard" superClass="gnu.cpp.compiler.option.dialect.std" useByScannerDiscovery="true" value="gnu.cpp.compiler.dialect.c++11" valueType="enumerated"/>
|
||||||
|
|
||||||
|
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1645688514" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
|
||||||
|
|
||||||
|
</tool>
|
||||||
|
|
||||||
|
<tool command="gcc" commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG} ${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}" errorParsers="org.eclipse.cdt.core.GCCErrorParser" id="cdt.managedbuild.tool.gnu.c.compiler.exe.debug.1300752229" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.debug">
|
||||||
|
|
||||||
|
<option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.exe.debug.option.optimization.level.1409543163" name="Optimization Level" superClass="gnu.c.compiler.exe.debug.option.optimization.level" useByScannerDiscovery="false" valueType="enumerated"/>
|
||||||
|
|
||||||
|
<option id="gnu.c.compiler.exe.debug.option.debugging.level.1822278323" name="Debug Level" superClass="gnu.c.compiler.exe.debug.option.debugging.level" useByScannerDiscovery="false" value="gnu.c.debugging.level.max" valueType="enumerated"/>
|
||||||
|
|
||||||
|
<option id="gnu.c.compiler.option.dialect.std.2083613886" superClass="gnu.c.compiler.option.dialect.std" useByScannerDiscovery="true" value="gnu.c.compiler.dialect.c11" valueType="enumerated"/>
|
||||||
|
|
||||||
|
<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1120873053" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
|
||||||
|
|
||||||
|
</tool>
|
||||||
|
|
||||||
|
<tool id="cdt.managedbuild.tool.gnu.c.linker.exe.debug.1449950316" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.debug"/>
|
||||||
|
|
||||||
|
<tool command="g++" commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG} ${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}" errorParsers="org.eclipse.cdt.core.GLDErrorParser" id="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug.695565058" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug">
|
||||||
|
|
||||||
|
<option id="gnu.cpp.link.option.libs.1890944240" name="Libraries (-l)" superClass="gnu.cpp.link.option.libs" useByScannerDiscovery="false" valueType="libs">
|
||||||
|
|
||||||
|
<listOptionValue builtIn="false" value="pthread"/>
|
||||||
|
|
||||||
|
<listOptionValue builtIn="false" value="thread"/>
|
||||||
|
|
||||||
|
</option>
|
||||||
|
|
||||||
|
<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.1594989801" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
|
||||||
|
|
||||||
|
<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
|
||||||
|
|
||||||
|
<additionalInput kind="additionalinput" paths="$(LIBS)"/>
|
||||||
|
|
||||||
|
</inputType>
|
||||||
|
|
||||||
|
</tool>
|
||||||
|
|
||||||
|
<tool command="as" commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG} ${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}" errorParsers="org.eclipse.cdt.core.GASErrorParser" id="cdt.managedbuild.tool.gnu.assembler.exe.debug.1145740153" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.exe.debug">
|
||||||
|
|
||||||
|
<inputType id="cdt.managedbuild.tool.gnu.assembler.input.322423778" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
|
||||||
|
|
||||||
|
</tool>
|
||||||
|
|
||||||
|
</toolChain>
|
||||||
|
|
||||||
|
</folderInfo>
|
||||||
|
|
||||||
|
<sourceEntries>
|
||||||
|
|
||||||
|
<entry excluding="Output|Input" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
|
||||||
|
|
||||||
|
</sourceEntries>
|
||||||
|
|
||||||
|
</configuration>
|
||||||
|
|
||||||
|
</storageModule>
|
||||||
|
|
||||||
|
<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
|
||||||
|
|
||||||
|
</cconfiguration>
|
||||||
|
|
||||||
|
<cconfiguration id="cdt.managedbuild.config.gnu.exe.release.181653410">
|
||||||
|
|
||||||
|
<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.exe.release.181653410" moduleId="org.eclipse.cdt.core.settings" name="Release">
|
||||||
|
|
||||||
|
<externalSettings/>
|
||||||
|
|
||||||
|
<extensions>
|
||||||
|
|
||||||
|
<extension id="org.eclipse.cdt.core.GNU_ELF" point="org.eclipse.cdt.core.BinaryParser"/>
|
||||||
|
|
||||||
|
<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
|
||||||
|
|
||||||
|
<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
|
||||||
|
|
||||||
|
<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
|
||||||
|
|
||||||
|
<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
|
||||||
|
|
||||||
|
<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
|
||||||
|
|
||||||
|
</extensions>
|
||||||
|
|
||||||
|
</storageModule>
|
||||||
|
|
||||||
|
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
|
||||||
|
|
||||||
|
<configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.release.181653410" name="Release" parent="cdt.managedbuild.config.gnu.exe.release">
|
||||||
|
|
||||||
|
<folderInfo id="cdt.managedbuild.config.gnu.exe.release.181653410." name="/" resourcePath="">
|
||||||
|
|
||||||
|
<toolChain id="cdt.managedbuild.toolchain.gnu.exe.release.924238465" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.release">
|
||||||
|
|
||||||
|
<targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.release.1498174934" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.release"/>
|
||||||
|
|
||||||
|
<builder buildPath="${workspace_loc:/FlippR-Driver}/Release" id="cdt.managedbuild.target.gnu.builder.exe.release.378454198" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" superClass="cdt.managedbuild.target.gnu.builder.exe.release"/>
|
||||||
|
|
||||||
|
<tool id="cdt.managedbuild.tool.gnu.archiver.base.757191749" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
|
||||||
|
|
||||||
|
<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.453034628" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release">
|
||||||
|
|
||||||
|
<option id="gnu.cpp.compiler.exe.release.option.optimization.level.504436300" name="Optimization Level" superClass="gnu.cpp.compiler.exe.release.option.optimization.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.optimization.level.most" valueType="enumerated"/>
|
||||||
|
|
||||||
|
<option id="gnu.cpp.compiler.exe.release.option.debugging.level.1441002290" name="Debug Level" superClass="gnu.cpp.compiler.exe.release.option.debugging.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.debugging.level.none" valueType="enumerated"/>
|
||||||
|
|
||||||
|
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.154120564" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
|
||||||
|
|
||||||
|
</tool>
|
||||||
|
|
||||||
|
<tool id="cdt.managedbuild.tool.gnu.c.compiler.exe.release.1561302106" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.release">
|
||||||
|
|
||||||
|
<option defaultValue="gnu.c.optimization.level.most" id="gnu.c.compiler.exe.release.option.optimization.level.1502872514" name="Optimization Level" superClass="gnu.c.compiler.exe.release.option.optimization.level" useByScannerDiscovery="false" valueType="enumerated"/>
|
||||||
|
|
||||||
|
<option id="gnu.c.compiler.exe.release.option.debugging.level.902326928" name="Debug Level" superClass="gnu.c.compiler.exe.release.option.debugging.level" useByScannerDiscovery="false" value="gnu.c.debugging.level.none" valueType="enumerated"/>
|
||||||
|
|
||||||
|
<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.809213766" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
|
||||||
|
|
||||||
|
</tool>
|
||||||
|
|
||||||
|
<tool id="cdt.managedbuild.tool.gnu.c.linker.exe.release.2089785117" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.release"/>
|
||||||
|
|
||||||
|
<tool id="cdt.managedbuild.tool.gnu.cpp.linker.exe.release.993724101" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.exe.release">
|
||||||
|
|
||||||
|
<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.856493026" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
|
||||||
|
|
||||||
|
<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
|
||||||
|
|
||||||
|
<additionalInput kind="additionalinput" paths="$(LIBS)"/>
|
||||||
|
|
||||||
|
</inputType>
|
||||||
|
|
||||||
|
</tool>
|
||||||
|
|
||||||
|
<tool id="cdt.managedbuild.tool.gnu.assembler.exe.release.2084332984" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.exe.release">
|
||||||
|
|
||||||
|
<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1008067521" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
|
||||||
|
|
||||||
|
</tool>
|
||||||
|
|
||||||
|
</toolChain>
|
||||||
|
|
||||||
|
</folderInfo>
|
||||||
|
|
||||||
|
<sourceEntries>
|
||||||
|
|
||||||
|
<entry excluding="Output|Input" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
|
||||||
|
|
||||||
|
</sourceEntries>
|
||||||
|
|
||||||
|
</configuration>
|
||||||
|
|
||||||
|
</storageModule>
|
||||||
|
|
||||||
|
<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
|
||||||
|
|
||||||
|
</cconfiguration>
|
||||||
|
|
||||||
|
</storageModule>
|
||||||
|
|
||||||
|
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
|
||||||
|
|
||||||
|
<project id="FlippR-Driver.cdt.managedbuild.target.gnu.exe.1526674224" name="Executable" projectType="cdt.managedbuild.target.gnu.exe"/>
|
||||||
|
|
||||||
|
</storageModule>
|
||||||
|
|
||||||
|
<storageModule moduleId="scannerConfiguration">
|
||||||
|
|
||||||
|
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
|
||||||
|
|
||||||
|
<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.1796611039;cdt.managedbuild.config.gnu.exe.debug.1796611039.;cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.496350382;cdt.managedbuild.tool.gnu.cpp.compiler.input.1645688514">
|
||||||
|
|
||||||
|
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
|
||||||
|
|
||||||
|
</scannerConfigBuildInfo>
|
||||||
|
|
||||||
|
<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.release.181653410;cdt.managedbuild.config.gnu.exe.release.181653410.;cdt.managedbuild.tool.gnu.c.compiler.exe.release.1561302106;cdt.managedbuild.tool.gnu.c.compiler.input.809213766">
|
||||||
|
|
||||||
|
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
|
||||||
|
|
||||||
|
</scannerConfigBuildInfo>
|
||||||
|
|
||||||
|
<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.1796611039;cdt.managedbuild.config.gnu.exe.debug.1796611039.;cdt.managedbuild.tool.gnu.c.compiler.exe.debug.1300752229;cdt.managedbuild.tool.gnu.c.compiler.input.1120873053">
|
||||||
|
|
||||||
|
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
|
||||||
|
|
||||||
|
</scannerConfigBuildInfo>
|
||||||
|
|
||||||
|
<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.release.181653410;cdt.managedbuild.config.gnu.exe.release.181653410.;cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.453034628;cdt.managedbuild.tool.gnu.cpp.compiler.input.154120564">
|
||||||
|
|
||||||
|
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
|
||||||
|
|
||||||
|
</scannerConfigBuildInfo>
|
||||||
|
|
||||||
|
</storageModule>
|
||||||
|
|
||||||
|
<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
|
||||||
|
|
||||||
|
<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
|
||||||
|
|
||||||
|
<storageModule moduleId="refreshScope" versionNumber="2">
|
||||||
|
|
||||||
|
<configuration configurationName="Debug">
|
||||||
|
|
||||||
|
<resource resourceType="PROJECT" workspacePath="/FlippR-Driver"/>
|
||||||
|
|
||||||
|
</configuration>
|
||||||
|
|
||||||
|
<configuration configurationName="Release">
|
||||||
|
|
||||||
|
<resource resourceType="PROJECT" workspacePath="/FlippR-Driver"/>
|
||||||
|
|
||||||
|
</configuration>
|
||||||
|
|
||||||
|
</storageModule>
|
||||||
|
|
||||||
|
<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
|
||||||
|
|
||||||
|
>>>>>>> 1f0fd916cc2f3e7edd60b5dc45f16f825c6f06db
|
||||||
</cproject>
|
</cproject>
|
||||||
|
|||||||
@@ -2,19 +2,28 @@ cmake_minimum_required(VERSION 3.9.1)
|
|||||||
project(flippr-driver)
|
project(flippr-driver)
|
||||||
|
|
||||||
set(CMAKE_BUILD_TYPE Debug)
|
set(CMAKE_BUILD_TYPE Debug)
|
||||||
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") # enable C++11 standard
|
||||||
|
|
||||||
set(CMAKE_SOURCE_DIR ../src)
|
set(CMAKE_SOURCE_DIR ../src)
|
||||||
|
|
||||||
set(CMAKE_BINARY_DIR ${CMAKE_SOURCE_DIR}/bin)
|
set(CMAKE_BINARY_DIR ${CMAKE_SOURCE_DIR}/bin)
|
||||||
set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR})
|
set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR})
|
||||||
set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR})
|
set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR})
|
||||||
|
set(SOURCE_DIR ../src)
|
||||||
|
|
||||||
find_package(Threads)
|
find_package(Threads)
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
include_directories(../src/input)
|
include_directories(../src/input)
|
||||||
include_directories(output)
|
include_directories(output)
|
||||||
include_directories(lib)
|
include_directories(lib)
|
||||||
include_directories(tests)
|
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")
|
file(GLOB SOURCES "src/*/*.cpp")
|
||||||
|
|
||||||
|
|||||||
@@ -1,18 +0,0 @@
|
|||||||
cmake_minimum_required(VERSION 3.0)
|
|
||||||
|
|
||||||
project(cmake_test)
|
|
||||||
|
|
||||||
# Prepare "Catch" library for other executables
|
|
||||||
set(CATCH_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../src/tests)
|
|
||||||
add_library(Catch INTERFACE)
|
|
||||||
target_include_directories(Catch INTERFACE ${CATCH_INCLUDE_DIR}/*)
|
|
||||||
|
|
||||||
# Make test executable
|
|
||||||
set(TEST_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/../../src/tests/input)
|
|
||||||
include_directories(${TEST_SOURCES})
|
|
||||||
include_directories(${TEST_SOURCES}/mocks)
|
|
||||||
|
|
||||||
file(GLOB SOURCES ${TEST_SOURCES}/*.cpp)
|
|
||||||
add_executable(tests ${SOURCES})
|
|
||||||
|
|
||||||
target_link_libraries(tests Catch)
|
|
||||||
@@ -28,8 +28,7 @@ class InputDriver
|
|||||||
|
|
||||||
public:
|
public:
|
||||||
InputDriver(EventNotifier* event_notifier, Detector* detector) :
|
InputDriver(EventNotifier* event_notifier, Detector* detector) :
|
||||||
event_notifier(event_notifier),
|
event_notifier(event_notifier), detector(detector)
|
||||||
detector(detector)
|
|
||||||
{
|
{
|
||||||
CLOG(INFO, INPUT_LOGGER) << "Created InputDriver";
|
CLOG(INFO, INPUT_LOGGER) << "Created InputDriver";
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,18 +0,0 @@
|
|||||||
cmake_minimum_required(VERSION 3.0)
|
|
||||||
|
|
||||||
project(cmake_test)
|
|
||||||
|
|
||||||
# Prepare "Catch" library for other executables
|
|
||||||
set(CATCH_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../src/tests)
|
|
||||||
add_library(Catch INTERFACE)
|
|
||||||
target_include_directories(Catch INTERFACE ${CATCH_INCLUDE_DIR}/*)
|
|
||||||
|
|
||||||
# Make test executable
|
|
||||||
set(TEST_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/../../src/tests/input)
|
|
||||||
include_directories(${TEST_SOURCES})
|
|
||||||
include_directories(${TEST_SOURCES}/mocks)
|
|
||||||
|
|
||||||
file(GLOB SOURCES ${TEST_SOURCES}/*.cpp)
|
|
||||||
add_executable(tests ${SOURCES})
|
|
||||||
|
|
||||||
target_link_libraries(tests Catch)
|
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -1,7 +0,0 @@
|
|||||||
/*
|
|
||||||
* TestDetector.cpp
|
|
||||||
*
|
|
||||||
* Created on: May 3, 2018
|
|
||||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert, Rafael Vinci, Dr. Franca Rupprecht
|
|
||||||
*/
|
|
||||||
#include "../catch.hpp"
|
|
||||||
@@ -1,54 +0,0 @@
|
|||||||
/*
|
|
||||||
* TestEventHandler.cpp
|
|
||||||
*
|
|
||||||
* Created on: May 31, 2018
|
|
||||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert, Rafael Vinci, Dr. Franca Rupprecht
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "../catch.hpp"
|
|
||||||
|
|
||||||
#include "../../input/EventHandler.hpp"
|
|
||||||
|
|
||||||
#include "mocks/InputDriverMock.hpp"
|
|
||||||
|
|
||||||
#define private public
|
|
||||||
|
|
||||||
SCENARIO("An EventHandler gets created and destroyed")
|
|
||||||
{
|
|
||||||
GIVEN("A shared pointer to an InputDriver and an EventHandler")
|
|
||||||
{
|
|
||||||
std::shared_ptr<Input::InputDriverMock> input_driver;
|
|
||||||
|
|
||||||
Input::EventHandler* event_handler = new Input::EventHandler(input_driver);
|
|
||||||
|
|
||||||
WHEN("An EventHandler is created")
|
|
||||||
{
|
|
||||||
REQUIRE(input_driver->registered = false);
|
|
||||||
|
|
||||||
THEN("The input driver is saved")
|
|
||||||
{
|
|
||||||
REQUIRE(event_handler->input_driver.get() == input_driver.get());
|
|
||||||
}
|
|
||||||
THEN("The handler is registered at the driver")
|
|
||||||
{
|
|
||||||
REQUIRE(input_driver->registered == true);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
WHEN("The EventHandler is destroyed")
|
|
||||||
{
|
|
||||||
REQUIRE(input_driver->registered == true);
|
|
||||||
|
|
||||||
delete(event_handler);
|
|
||||||
event_handler = NULL;
|
|
||||||
|
|
||||||
THEN("The handler is unregistered at the driver")
|
|
||||||
{
|
|
||||||
REQUIRE(input_driver->registered == false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Input::EventHandler::handle not tested because its virtual and should be overrided
|
|
||||||
|
|
||||||
@@ -1,70 +0,0 @@
|
|||||||
/*
|
|
||||||
* TestInputDriver.cpp
|
|
||||||
*
|
|
||||||
* Created on: May 31, 2018
|
|
||||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert, Rafael Vinci, Dr. Franca Rupprecht
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "../catch.hpp"
|
|
||||||
|
|
||||||
#include "../../input/InputDriver.hpp"
|
|
||||||
|
|
||||||
#include "mocks/EventHandlerMock.hpp"
|
|
||||||
#include "mocks/EventNotifierMock.hpp"
|
|
||||||
|
|
||||||
#define private public
|
|
||||||
|
|
||||||
SCENARIO("An InputDriver gets created", "[construction}")
|
|
||||||
{
|
|
||||||
GIVEN("An EventNotifier")
|
|
||||||
{
|
|
||||||
Input::EventNotifierMock event_notifier;
|
|
||||||
|
|
||||||
WHEN("The InputDriver gets created")
|
|
||||||
{
|
|
||||||
Input::InputDriver input_driver(&event_notifier);
|
|
||||||
|
|
||||||
THEN("It saved the EventNotifier")
|
|
||||||
{
|
|
||||||
REQUIRE(input_driver.event_notifier == &event_notifier);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
SCENARIO("An EventHandler [un]registers at the driver", "[[un]register]")
|
|
||||||
{
|
|
||||||
GIVEN("An InputDriver, EventHandler and an EventNotifier")
|
|
||||||
{
|
|
||||||
|
|
||||||
Input::EventHandler event_handler = Input::EventHandlerMock();
|
|
||||||
Input::EventNotifierMock event_notifier;
|
|
||||||
|
|
||||||
Input::InputDriver input_driver(&event_notifier);
|
|
||||||
|
|
||||||
REQUIRE(event_notifier.registered = false);
|
|
||||||
|
|
||||||
WHEN("The EventHandler registers at the driver")
|
|
||||||
{
|
|
||||||
input_driver.register_event_handler(&event_handler);
|
|
||||||
|
|
||||||
THEN("The register_event_handler at the event_notifier gets called")
|
|
||||||
{
|
|
||||||
REQUIRE(event_notifier.registered == true);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
WHEN("The EventHandler unregisters at the driver")
|
|
||||||
{
|
|
||||||
REQUIRE(event_notifier.registered = true);
|
|
||||||
input_driver.unregister_event_handler(&event_handler);
|
|
||||||
|
|
||||||
THEN("The unregister_event_handler at the event_notifier gets called")
|
|
||||||
{
|
|
||||||
REQUIRE(event_notifier.registered == false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
/*
|
|
||||||
* tests-main.cpp
|
|
||||||
*
|
|
||||||
* Created on: May 6, 2018
|
|
||||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert, Rafael Vinci, Dr. Franca Rupprecht
|
|
||||||
*/
|
|
||||||
|
|
||||||
#define CATCH_CONFIG_MAIN
|
|
||||||
#include "../catch.hpp"
|
|
||||||
@@ -1,27 +0,0 @@
|
|||||||
/*
|
|
||||||
* EventHandlerMock.hpp
|
|
||||||
*
|
|
||||||
* Created on: May 31, 2018
|
|
||||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert, Rafael Vinci, Dr. Franca Rupprecht
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef SRC_TESTS_INPUT_MOCKS_EVENTHANDLERMOCK_HPP_
|
|
||||||
#define SRC_TESTS_INPUT_MOCKS_EVENTHANDLERMOCK_HPP_
|
|
||||||
|
|
||||||
#include "../../../src/input/EventHandler.hpp"
|
|
||||||
|
|
||||||
namespace Input
|
|
||||||
{
|
|
||||||
|
|
||||||
class EventHandlerMock : EventHandler
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
void handle(Event& event) override
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif /* SRC_TESTS_INPUT_MOCKS_EVENTHANDLERMOCK_HPP_ */
|
|
||||||
@@ -1,39 +0,0 @@
|
|||||||
/*
|
|
||||||
* EventNotfierMock.hpp
|
|
||||||
*
|
|
||||||
* Created on: May 31, 2018
|
|
||||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert, Rafael Vinci, Dr. Franca Rupprecht
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef SRC_TESTS_INPUT_MOCKS_EVENTNOTIFIERMOCK_HPP_
|
|
||||||
#define SRC_TESTS_INPUT_MOCKS_EVENTNOTIFIERMOCK_HPP_
|
|
||||||
|
|
||||||
#include "../../../src/input/EventNotifier.h"
|
|
||||||
|
|
||||||
namespace Input
|
|
||||||
{
|
|
||||||
|
|
||||||
class EventNotifierMock : EventNotifier
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
EventNotifierMock() :
|
|
||||||
registered(false)
|
|
||||||
{}
|
|
||||||
|
|
||||||
void register_event_handler(EventHandler* handler) override
|
|
||||||
{
|
|
||||||
registered = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
void unregister_event_handler(EventHandler* handler) override
|
|
||||||
{
|
|
||||||
registered = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
public:
|
|
||||||
bool registered;
|
|
||||||
};
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif /* SRC_TESTS_INPUT_MOCKS_EVENTNOTIFIERMOCK_HPP_ */
|
|
||||||
@@ -1,34 +0,0 @@
|
|||||||
/*
|
|
||||||
* InputDriverMock.hpp
|
|
||||||
*
|
|
||||||
* Created on: May 31, 2018
|
|
||||||
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert, Rafael Vinci, Dr. Franca Rupprecht
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef SRC_TESTS_INPUT_MOCKS_INPUTDRIVERMOCK_HPP_
|
|
||||||
#define SRC_TESTS_INPUT_MOCKS_INPUTDRIVERMOCK_HPP_
|
|
||||||
|
|
||||||
|
|
||||||
#include "../../../src/input/InputDriver.hpp"
|
|
||||||
namespace Input
|
|
||||||
{
|
|
||||||
|
|
||||||
class InputDriverMock : InputDriver
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
InputDriverMock() :
|
|
||||||
registered(false)
|
|
||||||
{}
|
|
||||||
|
|
||||||
void register_input_handler(EventHandler* handler) override
|
|
||||||
{
|
|
||||||
registered = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
public:
|
|
||||||
bool registered;
|
|
||||||
};
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif /* SRC_TESTS_INPUT_MOCKS_INPUTDRIVERMOCK_HPP_ */
|
|
||||||
Reference in New Issue
Block a user