Closes #167 - fixes issues with jkvatne's pull request

Signed-off-by: Martin Melik-Merkumians <melik-merkumians@acin.tuwien.ac.at>

source/CMakeLists.txt

@@ -88,9 +88,6 @@ endif( OpENer_TESTS )
 # OpENer C flags                      #
 #######################################
 set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall" )
-# The following extra flags are needed to compile without warnings on mingw
-# TODO: Fix the root problems and remove this line
-set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-variable -Wno-incompatible-pointer-types -Wno-pointer-sign -Wno-format -Wno-discarded-qualifiers -Wno-unknown-pragmas" )
 
 ####################################################
 # Internal cache holding the available CIP objects #

source/src/ports/MINGW/Makefile

@@ -1,285 +0,0 @@
-# CMAKE generated file: DO NOT EDIT!
-# Generated by "MinGW Makefiles" Generator, CMake Version 3.12
-
-# 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.
-
-SHELL = cmd.exe
-
-# The CMake executable.
-CMAKE_COMMAND = "C:\Program Files\JetBrains\CLion 2018.2.4\bin\cmake\win\bin\cmake.exe"
-
-# The command to remove a file.
-RM = "C:\Program Files\JetBrains\CLion 2018.2.4\bin\cmake\win\bin\cmake.exe" -E remove -f
-
-# Escaping for special characters.
-EQUALS = =
-
-# The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = C:\Doc\opener-jkvatne\source
-
-# The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = C:\Doc\opener-jkvatne\source
-
-#=============================================================================
-# Targets provided globally by CMake.
-
-# Special rule for the target edit_cache
-edit_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "No interactive CMake dialog available..."
-	"C:\Program Files\JetBrains\CLion 2018.2.4\bin\cmake\win\bin\cmake.exe" -E echo "No interactive CMake dialog available."
-.PHONY : edit_cache
-
-# Special rule for the target edit_cache
-edit_cache/fast: edit_cache
-
-.PHONY : edit_cache/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..."
-	"C:\Program Files\JetBrains\CLion 2018.2.4\bin\cmake\win\bin\cmake.exe" -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 /d C:\Doc\opener-jkvatne\source && $(CMAKE_COMMAND) -E cmake_progress_start C:\Doc\opener-jkvatne\source\CMakeFiles C:\Doc\opener-jkvatne\source\src\ports\WIN32\CMakeFiles\progress.marks
-	cd /d C:\Doc\opener-jkvatne\source && $(MAKE) -f CMakeFiles\Makefile2 src/ports/WIN32/all
-	$(CMAKE_COMMAND) -E cmake_progress_start C:\Doc\opener-jkvatne\source\CMakeFiles 0
-.PHONY : all
-
-# The main clean target
-clean:
-	cd /d C:\Doc\opener-jkvatne\source && $(MAKE) -f CMakeFiles\Makefile2 src/ports/WIN32/clean
-.PHONY : clean
-
-# The main clean target
-clean/fast: clean
-
-.PHONY : clean/fast
-
-# Prepare targets for installation.
-preinstall: all
-	cd /d C:\Doc\opener-jkvatne\source && $(MAKE) -f CMakeFiles\Makefile2 src/ports/WIN32/preinstall
-.PHONY : preinstall
-
-# Prepare targets for installation.
-preinstall/fast:
-	cd /d C:\Doc\opener-jkvatne\source && $(MAKE) -f CMakeFiles\Makefile2 src/ports/WIN32/preinstall
-.PHONY : preinstall/fast
-
-# clear depends
-depend:
-	cd /d C:\Doc\opener-jkvatne\source && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles\Makefile.cmake 1
-.PHONY : depend
-
-# Convenience name for target.
-src/ports/WIN32/CMakeFiles/WIN32PLATFORM.dir/rule:
-	cd /d C:\Doc\opener-jkvatne\source && $(MAKE) -f CMakeFiles\Makefile2 src/ports/WIN32/CMakeFiles/WIN32PLATFORM.dir/rule
-.PHONY : src/ports/WIN32/CMakeFiles/WIN32PLATFORM.dir/rule
-
-# Convenience name for target.
-WIN32PLATFORM: src/ports/WIN32/CMakeFiles/WIN32PLATFORM.dir/rule
-
-.PHONY : WIN32PLATFORM
-
-# fast build rule for target.
-WIN32PLATFORM/fast:
-	cd /d C:\Doc\opener-jkvatne\source && $(MAKE) -f src\ports\WIN32\CMakeFiles\WIN32PLATFORM.dir\build.make src/ports/WIN32/CMakeFiles/WIN32PLATFORM.dir/build
-.PHONY : WIN32PLATFORM/fast
-
-# Convenience name for target.
-src/ports/WIN32/CMakeFiles/OpENer.dir/rule:
-	cd /d C:\Doc\opener-jkvatne\source && $(MAKE) -f CMakeFiles\Makefile2 src/ports/WIN32/CMakeFiles/OpENer.dir/rule
-.PHONY : src/ports/WIN32/CMakeFiles/OpENer.dir/rule
-
-# Convenience name for target.
-OpENer: src/ports/WIN32/CMakeFiles/OpENer.dir/rule
-
-.PHONY : OpENer
-
-# fast build rule for target.
-OpENer/fast:
-	cd /d C:\Doc\opener-jkvatne\source && $(MAKE) -f src\ports\WIN32\CMakeFiles\OpENer.dir\build.make src/ports/WIN32/CMakeFiles/OpENer.dir/build
-.PHONY : OpENer/fast
-
-main.obj: main.c.obj
-
-.PHONY : main.obj
-
-# target to build an object file
-main.c.obj:
-	cd /d C:\Doc\opener-jkvatne\source && $(MAKE) -f src\ports\WIN32\CMakeFiles\OpENer.dir\build.make src/ports/WIN32/CMakeFiles/OpENer.dir/main.c.obj
-.PHONY : main.c.obj
-
-main.i: main.c.i
-
-.PHONY : main.i
-
-# target to preprocess a source file
-main.c.i:
-	cd /d C:\Doc\opener-jkvatne\source && $(MAKE) -f src\ports\WIN32\CMakeFiles\OpENer.dir\build.make src/ports/WIN32/CMakeFiles/OpENer.dir/main.c.i
-.PHONY : main.c.i
-
-main.s: main.c.s
-
-.PHONY : main.s
-
-# target to generate assembly for a file
-main.c.s:
-	cd /d C:\Doc\opener-jkvatne\source && $(MAKE) -f src\ports\WIN32\CMakeFiles\OpENer.dir\build.make src/ports/WIN32/CMakeFiles/OpENer.dir/main.c.s
-.PHONY : main.c.s
-
-networkconfig.obj: networkconfig.c.obj
-
-.PHONY : networkconfig.obj
-
-# target to build an object file
-networkconfig.c.obj:
-	cd /d C:\Doc\opener-jkvatne\source && $(MAKE) -f src\ports\WIN32\CMakeFiles\WIN32PLATFORM.dir\build.make src/ports/WIN32/CMakeFiles/WIN32PLATFORM.dir/networkconfig.c.obj
-.PHONY : networkconfig.c.obj
-
-networkconfig.i: networkconfig.c.i
-
-.PHONY : networkconfig.i
-
-# target to preprocess a source file
-networkconfig.c.i:
-	cd /d C:\Doc\opener-jkvatne\source && $(MAKE) -f src\ports\WIN32\CMakeFiles\WIN32PLATFORM.dir\build.make src/ports/WIN32/CMakeFiles/WIN32PLATFORM.dir/networkconfig.c.i
-.PHONY : networkconfig.c.i
-
-networkconfig.s: networkconfig.c.s
-
-.PHONY : networkconfig.s
-
-# target to generate assembly for a file
-networkconfig.c.s:
-	cd /d C:\Doc\opener-jkvatne\source && $(MAKE) -f src\ports\WIN32\CMakeFiles\WIN32PLATFORM.dir\build.make src/ports/WIN32/CMakeFiles/WIN32PLATFORM.dir/networkconfig.c.s
-.PHONY : networkconfig.c.s
-
-networkhandler.obj: networkhandler.c.obj
-
-.PHONY : networkhandler.obj
-
-# target to build an object file
-networkhandler.c.obj:
-	cd /d C:\Doc\opener-jkvatne\source && $(MAKE) -f src\ports\WIN32\CMakeFiles\WIN32PLATFORM.dir\build.make src/ports/WIN32/CMakeFiles/WIN32PLATFORM.dir/networkhandler.c.obj
-.PHONY : networkhandler.c.obj
-
-networkhandler.i: networkhandler.c.i
-
-.PHONY : networkhandler.i
-
-# target to preprocess a source file
-networkhandler.c.i:
-	cd /d C:\Doc\opener-jkvatne\source && $(MAKE) -f src\ports\WIN32\CMakeFiles\WIN32PLATFORM.dir\build.make src/ports/WIN32/CMakeFiles/WIN32PLATFORM.dir/networkhandler.c.i
-.PHONY : networkhandler.c.i
-
-networkhandler.s: networkhandler.c.s
-
-.PHONY : networkhandler.s
-
-# target to generate assembly for a file
-networkhandler.c.s:
-	cd /d C:\Doc\opener-jkvatne\source && $(MAKE) -f src\ports\WIN32\CMakeFiles\WIN32PLATFORM.dir\build.make src/ports/WIN32/CMakeFiles/WIN32PLATFORM.dir/networkhandler.c.s
-.PHONY : networkhandler.c.s
-
-opener_error.obj: opener_error.c.obj
-
-.PHONY : opener_error.obj
-
-# target to build an object file
-opener_error.c.obj:
-	cd /d C:\Doc\opener-jkvatne\source && $(MAKE) -f src\ports\WIN32\CMakeFiles\WIN32PLATFORM.dir\build.make src/ports/WIN32/CMakeFiles/WIN32PLATFORM.dir/opener_error.c.obj
-.PHONY : opener_error.c.obj
-
-opener_error.i: opener_error.c.i
-
-.PHONY : opener_error.i
-
-# target to preprocess a source file
-opener_error.c.i:
-	cd /d C:\Doc\opener-jkvatne\source && $(MAKE) -f src\ports\WIN32\CMakeFiles\WIN32PLATFORM.dir\build.make src/ports/WIN32/CMakeFiles/WIN32PLATFORM.dir/opener_error.c.i
-.PHONY : opener_error.c.i
-
-opener_error.s: opener_error.c.s
-
-.PHONY : opener_error.s
-
-# target to generate assembly for a file
-opener_error.c.s:
-	cd /d C:\Doc\opener-jkvatne\source && $(MAKE) -f src\ports\WIN32\CMakeFiles\WIN32PLATFORM.dir\build.make src/ports/WIN32/CMakeFiles/WIN32PLATFORM.dir/opener_error.c.s
-.PHONY : opener_error.c.s
-
-# 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 ... WIN32PLATFORM
-	@echo ... OpENer
-	@echo ... edit_cache
-	@echo ... rebuild_cache
-	@echo ... main.obj
-	@echo ... main.i
-	@echo ... main.s
-	@echo ... networkconfig.obj
-	@echo ... networkconfig.i
-	@echo ... networkconfig.s
-	@echo ... networkhandler.obj
-	@echo ... networkhandler.i
-	@echo ... networkhandler.s
-	@echo ... opener_error.obj
-	@echo ... opener_error.i
-	@echo ... opener_error.s
-.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 /d C:\Doc\opener-jkvatne\source && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles\Makefile.cmake 0
-.PHONY : cmake_check_build_system
-

source/src/ports/MINGW/sample_application/Makefile

@@ -1,179 +0,0 @@
-# CMAKE generated file: DO NOT EDIT!
-# Generated by "MinGW Makefiles" Generator, CMake Version 3.12
-
-# 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.
-
-SHELL = cmd.exe
-
-# The CMake executable.
-CMAKE_COMMAND = "C:\Program Files\JetBrains\CLion 2018.2.4\bin\cmake\win\bin\cmake.exe"
-
-# The command to remove a file.
-RM = "C:\Program Files\JetBrains\CLion 2018.2.4\bin\cmake\win\bin\cmake.exe" -E remove -f
-
-# Escaping for special characters.
-EQUALS = =
-
-# The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = C:\Doc\opener-jkvatne\source
-
-# The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = C:\Doc\opener-jkvatne\source
-
-#=============================================================================
-# Targets provided globally by CMake.
-
-# Special rule for the target edit_cache
-edit_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "No interactive CMake dialog available..."
-	"C:\Program Files\JetBrains\CLion 2018.2.4\bin\cmake\win\bin\cmake.exe" -E echo "No interactive CMake dialog available."
-.PHONY : edit_cache
-
-# Special rule for the target edit_cache
-edit_cache/fast: edit_cache
-
-.PHONY : edit_cache/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..."
-	"C:\Program Files\JetBrains\CLion 2018.2.4\bin\cmake\win\bin\cmake.exe" -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 /d C:\Doc\opener-jkvatne\source && $(CMAKE_COMMAND) -E cmake_progress_start C:\Doc\opener-jkvatne\source\CMakeFiles C:\Doc\opener-jkvatne\source\src\ports\WIN32\sample_application\CMakeFiles\progress.marks
-	cd /d C:\Doc\opener-jkvatne\source && $(MAKE) -f CMakeFiles\Makefile2 src/ports/WIN32/sample_application/all
-	$(CMAKE_COMMAND) -E cmake_progress_start C:\Doc\opener-jkvatne\source\CMakeFiles 0
-.PHONY : all
-
-# The main clean target
-clean:
-	cd /d C:\Doc\opener-jkvatne\source && $(MAKE) -f CMakeFiles\Makefile2 src/ports/WIN32/sample_application/clean
-.PHONY : clean
-
-# The main clean target
-clean/fast: clean
-
-.PHONY : clean/fast
-
-# Prepare targets for installation.
-preinstall: all
-	cd /d C:\Doc\opener-jkvatne\source && $(MAKE) -f CMakeFiles\Makefile2 src/ports/WIN32/sample_application/preinstall
-.PHONY : preinstall
-
-# Prepare targets for installation.
-preinstall/fast:
-	cd /d C:\Doc\opener-jkvatne\source && $(MAKE) -f CMakeFiles\Makefile2 src/ports/WIN32/sample_application/preinstall
-.PHONY : preinstall/fast
-
-# clear depends
-depend:
-	cd /d C:\Doc\opener-jkvatne\source && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles\Makefile.cmake 1
-.PHONY : depend
-
-# Convenience name for target.
-src/ports/WIN32/sample_application/CMakeFiles/SAMPLE_APP.dir/rule:
-	cd /d C:\Doc\opener-jkvatne\source && $(MAKE) -f CMakeFiles\Makefile2 src/ports/WIN32/sample_application/CMakeFiles/SAMPLE_APP.dir/rule
-.PHONY : src/ports/WIN32/sample_application/CMakeFiles/SAMPLE_APP.dir/rule
-
-# Convenience name for target.
-SAMPLE_APP: src/ports/WIN32/sample_application/CMakeFiles/SAMPLE_APP.dir/rule
-
-.PHONY : SAMPLE_APP
-
-# fast build rule for target.
-SAMPLE_APP/fast:
-	cd /d C:\Doc\opener-jkvatne\source && $(MAKE) -f src\ports\WIN32\sample_application\CMakeFiles\SAMPLE_APP.dir\build.make src/ports/WIN32/sample_application/CMakeFiles/SAMPLE_APP.dir/build
-.PHONY : SAMPLE_APP/fast
-
-sampleapplication.obj: sampleapplication.c.obj
-
-.PHONY : sampleapplication.obj
-
-# target to build an object file
-sampleapplication.c.obj:
-	cd /d C:\Doc\opener-jkvatne\source && $(MAKE) -f src\ports\WIN32\sample_application\CMakeFiles\SAMPLE_APP.dir\build.make src/ports/WIN32/sample_application/CMakeFiles/SAMPLE_APP.dir/sampleapplication.c.obj
-.PHONY : sampleapplication.c.obj
-
-sampleapplication.i: sampleapplication.c.i
-
-.PHONY : sampleapplication.i
-
-# target to preprocess a source file
-sampleapplication.c.i:
-	cd /d C:\Doc\opener-jkvatne\source && $(MAKE) -f src\ports\WIN32\sample_application\CMakeFiles\SAMPLE_APP.dir\build.make src/ports/WIN32/sample_application/CMakeFiles/SAMPLE_APP.dir/sampleapplication.c.i
-.PHONY : sampleapplication.c.i
-
-sampleapplication.s: sampleapplication.c.s
-
-.PHONY : sampleapplication.s
-
-# target to generate assembly for a file
-sampleapplication.c.s:
-	cd /d C:\Doc\opener-jkvatne\source && $(MAKE) -f src\ports\WIN32\sample_application\CMakeFiles\SAMPLE_APP.dir\build.make src/ports/WIN32/sample_application/CMakeFiles/SAMPLE_APP.dir/sampleapplication.c.s
-.PHONY : sampleapplication.c.s
-
-# 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 ... SAMPLE_APP
-	@echo ... edit_cache
-	@echo ... rebuild_cache
-	@echo ... sampleapplication.obj
-	@echo ... sampleapplication.i
-	@echo ... sampleapplication.s
-.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 /d C:\Doc\opener-jkvatne\source && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles\Makefile.cmake 0
-.PHONY : cmake_check_build_system
-

source/src/ports/MINGW/sample_application/cmake_install.cmake

@@ -1,34 +0,0 @@
-# Install script for directory: C:/Doc/opener-jkvatne/source/src/ports/WIN32/sample_application
-
-# Set the install prefix
-if(NOT DEFINED CMAKE_INSTALL_PREFIX)
-  set(CMAKE_INSTALL_PREFIX "C:/Program Files (x86)/OpENer")
-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 "")
-  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()
-
-# Is this installation the result of a crosscompile?
-if(NOT DEFINED CMAKE_CROSSCOMPILING)
-  set(CMAKE_CROSSCOMPILING "FALSE")
-endif()
-