From 3a406c4e8384f682f8718fabc6778da51c224484 Mon Sep 17 00:00:00 2001
From: Nicolas Pope <nicolas.pope@utu.fi>
Date: Mon, 9 May 2022 08:49:02 +0100
Subject: [PATCH] Fix for windows cmake
---
.gitlab-ci.yml | 5 ++++-
CMakeLists.txt | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fad8a79..0385bdb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -119,6 +119,9 @@ windows:build:
tags:
- windows
+ needs: []
+ dependencies: []
+
cache: # use artifacts instead if multiple runners available
key: $CI_COMMIT_SHORT_SHA
paths:
@@ -136,7 +139,7 @@ windows:build:
windows:test:
only:
- - master
+ - main
- merge_requests
stage: test
diff --git a/CMakeLists.txt b/CMakeLists.txt
index aea9e94..1a39fa4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -142,7 +142,7 @@ configure_file(${CMAKE_SOURCE_DIR}/src/config.cpp.in
if (WIN32) # TODO(nick) Should do based upon compiler (VS)
set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT ${VS_STARTUP_PROJECT})
- set_property(TARGET voltu-node PROPERTY VS_DEBUGGER_WORKING_DIRECTORY ${VS_DEBUG_WORKING_DIRECTORY})
+ #set_property(TARGET voltu-node PROPERTY VS_DEBUGGER_WORKING_DIRECTORY ${VS_DEBUG_WORKING_DIRECTORY})
endif()
#include(ftl_CPack)
--
GitLab