Merge branch 'feature/upstream' into develop

5 files changed, 327 insertions, 0 deletions

diff --git a/app/lib/demos/CMakeFiles/CMakeDirectoryInformation.cmake b/app/lib/demos/CMakeFiles/CMakeDirectoryInformation.cmake
new file mode 100644
index 0000000..2569371
--- /dev/null
+++ b/app/lib/demos/CMakeFiles/CMakeDirectoryInformation.cmake
@@ -0,0 +1,16 @@
+# CMAKE generated file: DO NOT EDIT!
+# Generated by "Unix Makefiles" Generator, CMake Version 3.6
+
+# Relative path conversion top directories.
+set(CMAKE_RELATIVE_PATH_TOP_SOURCE "/home/martin/XTrackCAD/src/work")
+set(CMAKE_RELATIVE_PATH_TOP_BINARY "/home/martin/XTrackCAD/src/work")
+
+# Force unix paths in dependencies.
+set(CMAKE_FORCE_UNIX_PATHS 1)
+
+
+# The C and CXX include file regular expressions for this directory.
+set(CMAKE_C_INCLUDE_REGEX_SCAN "^.*$")
+set(CMAKE_C_INCLUDE_REGEX_COMPLAIN "^$")
+set(CMAKE_CXX_INCLUDE_REGEX_SCAN ${CMAKE_C_INCLUDE_REGEX_SCAN})
+set(CMAKE_CXX_INCLUDE_REGEX_COMPLAIN ${CMAKE_C_INCLUDE_REGEX_COMPLAIN})
diff --git a/app/lib/demos/CMakeFiles/progress.marks b/app/lib/demos/CMakeFiles/progress.marks
new file mode 100644
index 0000000..573541a
--- /dev/null
+++ b/app/lib/demos/CMakeFiles/progress.marks
@@ -0,0 +1 @@
+0
diff --git a/app/lib/demos/CTestTestfile.cmake b/app/lib/demos/CTestTestfile.cmake
new file mode 100644
index 0000000..3643135
--- /dev/null
+++ b/app/lib/demos/CTestTestfile.cmake
@@ -0,0 +1,6 @@
+# CMake generated Testfile for 
+# Source directory: /home/martin/XTrackCAD/src/work/app/lib/demos
+# Build directory: /home/martin/XTrackCAD/src/work/app/lib/demos
+# 
+# This file includes the relevant testing commands required for 
+# testing this directory and lists subdirectories to be tested as well.
diff --git a/app/lib/demos/Makefile b/app/lib/demos/Makefile
new file mode 100644
index 0000000..6c2ebcf
--- /dev/null
+++ b/app/lib/demos/Makefile
@@ -0,0 +1,218 @@
+# CMAKE generated file: DO NOT EDIT!
+# Generated by "Unix Makefiles" Generator, CMake Version 3.6
+
+# Default target executed when no arguments are given to make.
+default_target: all
+
+.PHONY : default_target
+
+# Allow only one "make -f Makefile2" at a time, but pass parallelism.
+.NOTPARALLEL:
+
+
+#=============================================================================
+# 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
+
+#=============================================================================
+# Targets provided globally by CMake.
+
+# Special rule for the target edit_cache
+edit_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
+	/usr/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : edit_cache
+
+# Special rule for the target edit_cache
+edit_cache/fast: edit_cache
+
+.PHONY : edit_cache/fast
+
+# Special rule for the target install/strip
+install/strip: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
+	/usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+.PHONY : install/strip
+
+# Special rule for the target install/strip
+install/strip/fast: install/strip
+
+.PHONY : install/strip/fast
+
+# Special rule for the target test
+test:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running tests..."
+	/usr/bin/ctest --force-new-ctest-process $(ARGS)
+.PHONY : test
+
+# Special rule for the target test
+test/fast: test
+
+.PHONY : test/fast
+
+# Special rule for the target package_source
+package_source:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Run CPack packaging tool for source..."
+	cd /home/martin/XTrackCAD/src/work && /usr/bin/cpack --config ./CPackSourceConfig.cmake /home/martin/XTrackCAD/src/work/CPackSourceConfig.cmake
+.PHONY : package_source
+
+# Special rule for the target package_source
+package_source/fast: package_source
+
+.PHONY : package_source/fast
+
+# Special rule for the target package
+package: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Run CPack packaging tool..."
+	cd /home/martin/XTrackCAD/src/work && /usr/bin/cpack --config ./CPackConfig.cmake
+.PHONY : package
+
+# Special rule for the target package
+package/fast: package
+
+.PHONY : package/fast
+
+# Special rule for the target install/local
+install/local: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
+	/usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+.PHONY : install/local
+
+# Special rule for the target install/local
+install/local/fast: install/local
+
+.PHONY : install/local/fast
+
+# Special rule for the target install
+install: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
+	/usr/bin/cmake -P cmake_install.cmake
+.PHONY : install
+
+# Special rule for the target install
+install/fast: preinstall/fast
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
+	/usr/bin/cmake -P cmake_install.cmake
+.PHONY : install/fast
+
+# Special rule for the target list_install_components
+list_install_components:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Available install components are: \"Unspecified\""
+.PHONY : list_install_components
+
+# Special rule for the target list_install_components
+list_install_components/fast: list_install_components
+
+.PHONY : list_install_components/fast
+
+# Special rule for the target rebuild_cache
+rebuild_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
+	/usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : rebuild_cache
+
+# Special rule for the target rebuild_cache
+rebuild_cache/fast: rebuild_cache
+
+.PHONY : rebuild_cache/fast
+
+# The main all target
+all: cmake_check_build_system
+	cd /home/martin/XTrackCAD/src/work && $(CMAKE_COMMAND) -E cmake_progress_start /home/martin/XTrackCAD/src/work/CMakeFiles /home/martin/XTrackCAD/src/work/app/lib/demos/CMakeFiles/progress.marks
+	cd /home/martin/XTrackCAD/src/work && $(MAKE) -f CMakeFiles/Makefile2 app/lib/demos/all
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/martin/XTrackCAD/src/work/CMakeFiles 0
+.PHONY : all
+
+# The main clean target
+clean:
+	cd /home/martin/XTrackCAD/src/work && $(MAKE) -f CMakeFiles/Makefile2 app/lib/demos/clean
+.PHONY : clean
+
+# The main clean target
+clean/fast: clean
+
+.PHONY : clean/fast
+
+# Prepare targets for installation.
+preinstall: all
+	cd /home/martin/XTrackCAD/src/work && $(MAKE) -f CMakeFiles/Makefile2 app/lib/demos/preinstall
+.PHONY : preinstall
+
+# Prepare targets for installation.
+preinstall/fast:
+	cd /home/martin/XTrackCAD/src/work && $(MAKE) -f CMakeFiles/Makefile2 app/lib/demos/preinstall
+.PHONY : preinstall/fast
+
+# clear depends
+depend:
+	cd /home/martin/XTrackCAD/src/work && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+.PHONY : depend
+
+# Help Target
+help:
+	@echo "The following are some of the valid targets for this Makefile:"
+	@echo "... all (the default if no target is provided)"
+	@echo "... clean"
+	@echo "... depend"
+	@echo "... edit_cache"
+	@echo "... install/strip"
+	@echo "... test"
+	@echo "... package_source"
+	@echo "... package"
+	@echo "... install/local"
+	@echo "... install"
+	@echo "... list_install_components"
+	@echo "... rebuild_cache"
+.PHONY : help
+
+
+
+#=============================================================================
+# Special targets to cleanup operation of make.
+
+# Special rule to run CMake to check the build system integrity.
+# No rule that depends on this can have commands that come from listfiles
+# because they might be regenerated.
+cmake_check_build_system:
+	cd /home/martin/XTrackCAD/src/work && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+.PHONY : cmake_check_build_system
+
diff --git a/app/lib/demos/cmake_install.cmake b/app/lib/demos/cmake_install.cmake
new file mode 100644
index 0000000..1f08d58
--- /dev/null
+++ b/app/lib/demos/cmake_install.cmake
@@ -0,0 +1,86 @@
+# Install script for directory: /home/martin/XTrackCAD/src/work/app/lib/demos
+
+# Set the install prefix
+if(NOT DEFINED CMAKE_INSTALL_PREFIX)
+  set(CMAKE_INSTALL_PREFIX "/usr/local")
+endif()
+string(REGEX REPLACE "/$" "" CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
+
+# Set the install configuration name.
+if(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME)
+  if(BUILD_TYPE)
+    string(REGEX REPLACE "^[^A-Za-z0-9_]+" ""
+           CMAKE_INSTALL_CONFIG_NAME "${BUILD_TYPE}")
+  else()
+    set(CMAKE_INSTALL_CONFIG_NAME "Debug")
+  endif()
+  message(STATUS "Install configuration: \"${CMAKE_INSTALL_CONFIG_NAME}\"")
+endif()
+
+# Set the component getting installed.
+if(NOT CMAKE_INSTALL_COMPONENT)
+  if(COMPONENT)
+    message(STATUS "Install component: \"${COMPONENT}\"")
+    set(CMAKE_INSTALL_COMPONENT "${COMPONENT}")
+  else()
+    set(CMAKE_INSTALL_COMPONENT)
+  endif()
+endif()
+
+# Install shared libraries without execute permission?
+if(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE)
+  set(CMAKE_INSTALL_SO_NO_EXE "0")
+endif()
+
+if("${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified" OR NOT CMAKE_INSTALL_COMPONENT)
+  file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/share/xtrkcad/demos" TYPE FILE FILES
+    "/home/martin/XTrackCAD/src/work/app/lib/demos/dmadjend.xtr"
+    "/home/martin/XTrackCAD/src/work/app/lib/demos/dmbench.xtr"
+    "/home/martin/XTrackCAD/src/work/app/lib/demos/dmcancel.xtr"
+    "/home/martin/XTrackCAD/src/work/app/lib/demos/dmcircle.xtr"
+    "/home/martin/XTrackCAD/src/work/app/lib/demos/dmconn1.xtr"
+    "/home/martin/XTrackCAD/src/work/app/lib/demos/dmconn2.xtr"
+    "/home/martin/XTrackCAD/src/work/app/lib/demos/dmcrvtrk.xtr"
+    "/home/martin/XTrackCAD/src/work/app/lib/demos/dmctlpnl.xtr"
+    "/home/martin/XTrackCAD/src/work/app/lib/demos/dmdelund.xtr"
+    "/home/martin/XTrackCAD/src/work/app/lib/demos/dmdialog.xtr"
+    "/home/martin/XTrackCAD/src/work/app/lib/demos/dmdimlin.xtr"
+    "/home/martin/XTrackCAD/src/work/app/lib/demos/dmease.xtr"
+    "/home/martin/XTrackCAD/src/work/app/lib/demos/dmelev.xtr"
+    "/home/martin/XTrackCAD/src/work/app/lib/demos/dmexcept.xtr"
+    "/home/martin/XTrackCAD/src/work/app/lib/demos/dmextend.xtr"
+    "/home/martin/XTrackCAD/src/work/app/lib/demos/dmflip.xtr"
+    "/home/martin/XTrackCAD/src/work/app/lib/demos/dmgroup.xtr"
+    "/home/martin/XTrackCAD/src/work/app/lib/demos/dmhelix.xtr"
+    "/home/martin/XTrackCAD/src/work/app/lib/demos/dmhndld.xtr"
+    "/home/martin/XTrackCAD/src/work/app/lib/demos/dmintro.xtr"
+    "/home/martin/XTrackCAD/src/work/app/lib/demos/dmjcir.xtr"
+    "/home/martin/XTrackCAD/src/work/app/lib/demos/dmjnabut.xtr"
+    "/home/martin/XTrackCAD/src/work/app/lib/demos/dmjncs.xtr"
+    "/home/martin/XTrackCAD/src/work/app/lib/demos/dmjnmove.xtr"
+    "/home/martin/XTrackCAD/src/work/app/lib/demos/dmjnss.xtr"
+    "/home/martin/XTrackCAD/src/work/app/lib/demos/dmjntt.xtr"
+    "/home/martin/XTrackCAD/src/work/app/lib/demos/dmlines.xtr"
+    "/home/martin/XTrackCAD/src/work/app/lib/demos/dmlines2.xtr"
+    "/home/martin/XTrackCAD/src/work/app/lib/demos/dmmouse.xtr"
+    "/home/martin/XTrackCAD/src/work/app/lib/demos/dmmovabt.xtr"
+    "/home/martin/XTrackCAD/src/work/app/lib/demos/dmnotes.xtr"
+    "/home/martin/XTrackCAD/src/work/app/lib/demos/dmparall.xtr"
+    "/home/martin/XTrackCAD/src/work/app/lib/demos/dmplymod.xtr"
+    "/home/martin/XTrackCAD/src/work/app/lib/demos/dmprof.xtr"
+    "/home/martin/XTrackCAD/src/work/app/lib/demos/dmrescal.xtr"
+    "/home/martin/XTrackCAD/src/work/app/lib/demos/dmrotate.xtr"
+    "/home/martin/XTrackCAD/src/work/app/lib/demos/dmruler.xtr"
+    "/home/martin/XTrackCAD/src/work/app/lib/demos/dmselect.xtr"
+    "/home/martin/XTrackCAD/src/work/app/lib/demos/dmsplit.xtr"
+    "/home/martin/XTrackCAD/src/work/app/lib/demos/dmstrtrk.xtr"
+    "/home/martin/XTrackCAD/src/work/app/lib/demos/dmtbledg.xtr"
+    "/home/martin/XTrackCAD/src/work/app/lib/demos/dmtodes.xtr"
+    "/home/martin/XTrackCAD/src/work/app/lib/demos/dmtosel.xtr"
+    "/home/martin/XTrackCAD/src/work/app/lib/demos/dmtotrim.xtr"
+    "/home/martin/XTrackCAD/src/work/app/lib/demos/dmtoyard.xtr"
+    "/home/martin/XTrackCAD/src/work/app/lib/demos/dmtrkwid.xtr"
+    "/home/martin/XTrackCAD/src/work/app/lib/demos/dmtrntab.xtr"
+    )
+endif()
+