Merge branch 'feature/upstream' into develop

4 files changed, 96 insertions, 0 deletions

diff --git a/app/doc/CMakeFiles/clean-html.dir/DependInfo.cmake b/app/doc/CMakeFiles/clean-html.dir/DependInfo.cmake
new file mode 100644
index 0000000..19fab21
--- /dev/null
+++ b/app/doc/CMakeFiles/clean-html.dir/DependInfo.cmake
@@ -0,0 +1,11 @@
+# The set of languages for which implicit dependencies are needed:
+set(CMAKE_DEPENDS_LANGUAGES
+  )
+# The set of files for implicit dependencies of each language:
+
+# Targets to which this target links.
+set(CMAKE_TARGET_LINKED_INFO_FILES
+  )
+
+# Fortran module output directory.
+set(CMAKE_Fortran_TARGET_MODULE_DIR "")
diff --git a/app/doc/CMakeFiles/clean-html.dir/build.make b/app/doc/CMakeFiles/clean-html.dir/build.make
new file mode 100644
index 0000000..b3a78ce
--- /dev/null
+++ b/app/doc/CMakeFiles/clean-html.dir/build.make
@@ -0,0 +1,76 @@
+# CMAKE generated file: DO NOT EDIT!
+# Generated by "Unix Makefiles" Generator, CMake Version 3.6
+
+# Delete rule output on recipe failure.
+.DELETE_ON_ERROR:
+
+
+#=============================================================================
+# Special targets provided by cmake.
+
+# Disable implicit rules so canonical targets will work.
+.SUFFIXES:
+
+
+# Remove some rules from gmake that .SUFFIXES does not remove.
+SUFFIXES =
+
+.SUFFIXES: .hpux_make_needs_suffix_list
+
+
+# Suppress display of executed commands.
+$(VERBOSE).SILENT:
+
+
+# A target that is always out of date.
+cmake_force:
+
+.PHONY : cmake_force
+
+#=============================================================================
+# Set environment variables for the build.
+
+# The shell in which to execute make rules.
+SHELL = /bin/sh
+
+# The CMake executable.
+CMAKE_COMMAND = /usr/bin/cmake
+
+# The command to remove a file.
+RM = /usr/bin/cmake -E remove -f
+
+# Escaping for special characters.
+EQUALS = =
+
+# The top-level source directory on which CMake was run.
+CMAKE_SOURCE_DIR = /home/martin/XTrackCAD/src/work
+
+# The top-level build directory on which CMake was run.
+CMAKE_BINARY_DIR = /home/martin/XTrackCAD/src/work
+
+# Utility rule file for clean-html.
+
+# Include the progress variables for this target.
+include app/doc/CMakeFiles/clean-html.dir/progress.make
+
+app/doc/CMakeFiles/clean-html:
+	cd /home/martin/XTrackCAD/src/work/app/doc/html && /usr/bin/cmake -P /home/martin/XTrackCAD/src/work/app/doc/clean-html.cmake
+
+clean-html: app/doc/CMakeFiles/clean-html
+clean-html: app/doc/CMakeFiles/clean-html.dir/build.make
+
+.PHONY : clean-html
+
+# Rule to build all files generated by this target.
+app/doc/CMakeFiles/clean-html.dir/build: clean-html
+
+.PHONY : app/doc/CMakeFiles/clean-html.dir/build
+
+app/doc/CMakeFiles/clean-html.dir/clean:
+	cd /home/martin/XTrackCAD/src/work/app/doc && $(CMAKE_COMMAND) -P CMakeFiles/clean-html.dir/cmake_clean.cmake
+.PHONY : app/doc/CMakeFiles/clean-html.dir/clean
+
+app/doc/CMakeFiles/clean-html.dir/depend:
+	cd /home/martin/XTrackCAD/src/work && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /home/martin/XTrackCAD/src/work /home/martin/XTrackCAD/src/work/app/doc /home/martin/XTrackCAD/src/work /home/martin/XTrackCAD/src/work/app/doc /home/martin/XTrackCAD/src/work/app/doc/CMakeFiles/clean-html.dir/DependInfo.cmake --color=$(COLOR)
+.PHONY : app/doc/CMakeFiles/clean-html.dir/depend
+
diff --git a/app/doc/CMakeFiles/clean-html.dir/cmake_clean.cmake b/app/doc/CMakeFiles/clean-html.dir/cmake_clean.cmake
new file mode 100644
index 0000000..512ab5c
--- /dev/null
+++ b/app/doc/CMakeFiles/clean-html.dir/cmake_clean.cmake
@@ -0,0 +1,8 @@
+file(REMOVE_RECURSE
+  "CMakeFiles/clean-html"
+)
+
+# Per-language clean rules from dependency scanning.
+foreach(lang )
+  include(CMakeFiles/clean-html.dir/cmake_clean_${lang}.cmake OPTIONAL)
+endforeach()
diff --git a/app/doc/CMakeFiles/clean-html.dir/progress.make b/app/doc/CMakeFiles/clean-html.dir/progress.make
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/app/doc/CMakeFiles/clean-html.dir/progress.make
@@ -0,0 +1 @@
+