From 9bfddef9205745e851aaae8079a303c4ba1fa261 Mon Sep 17 00:00:00 2001
From: Lukas Heiligenbrunner <lukas.heiligenbrunner@gmail.com>
Date: Sat, 31 Oct 2020 11:57:49 +0100
Subject: [PATCH] build in one job

---
 .gitlab-ci.yml    | 20 +++++---------------
 CMakeLists.txt    |  2 +-
 src/api/IPAPI.cpp |  4 ++--
 3 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ed74c85..a24412c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,7 +9,7 @@ image: conanio/gcc9:latest
 
 cache:
   paths:
-    - $HOME/.conan/data
+    - ../.conan/data
 
 conan:
   stage: conan
@@ -19,20 +19,10 @@ conan:
     - conan user lukas-heiligenbrunner -r bintray -p $CONAN_KEY
     - conan remote add bincrafters https://api.bintray.com/conan/bincrafters/public-conan
     - CONAN_SYSREQUIRES_MODE=enabled conan install . --build=missing -g cmake -if build
+    - cmake -S . -B build -D WinBuild=OFF -D GUI=OFF
+    - cd build
+    - make
   artifacts:
     paths:
       - build/
-    expire_in: 1 days
-
-# Unix Build
-cmake:
-  stage: cmake
-  script:
-    - cmake -S . -B build -D WinBuild=OFF -D GUI=OFF
-
-# Unix Build
-build:
-  stage: build
-  script:
-    - cd build
-    - make
\ No newline at end of file
+    expire_in: 1 days
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d91b9a6..b7a0d4b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,7 +20,7 @@ option(BUILD_DOC "Build documentation" ON) # additional dependency for Doxygen
 option(PACKAGING "Allow Packaging to <exe>, <deb> or <rpm>" ON) # additional dependencies for RPMbuild,dpkg  or NSIS
 option(TESTS "Build Tests" ON) # additional dependencies for GTEST - to build tests
 option(GUI "Build GUI elements" ON) # additional dependencies to QT libraries needed
-option(WinBuild "cross compile for Windows Platform" ON)
+option(WinBuild "cross compile for Windows Platform" OFF)
 
 # helper variables
 SET(CMAKE_CXX_STANDARD 17)
diff --git a/src/api/IPAPI.cpp b/src/api/IPAPI.cpp
index 11723fd..b202644 100644
--- a/src/api/IPAPI.cpp
+++ b/src/api/IPAPI.cpp
@@ -1,5 +1,5 @@
-#include <inc/IpHelper.h>
-#include <inc/Logger.h>
+#include <IpHelper.h>
+#include <Logger.h>
 #include "api/IPAPI.h"
 
 std::string IPAPI::getGlobalIp() {