Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
B
Beyond Protocol
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Beyond AKA
Beyond Protocol
Commits
3a406c4e
Commit
3a406c4e
authored
2 years ago
by
Nicolas Pope
Browse files
Options
Downloads
Patches
Plain Diff
Fix for windows cmake
parent
65f49f9f
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+4
-1
4 additions, 1 deletion
.gitlab-ci.yml
CMakeLists.txt
+1
-1
1 addition, 1 deletion
CMakeLists.txt
with
5 additions
and
2 deletions
.gitlab-ci.yml
+
4
−
1
View file @
3a406c4e
...
...
@@ -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
:
-
ma
ster
-
ma
in
-
merge_requests
stage
:
test
...
...
This diff is collapsed.
Click to expand it.
CMakeLists.txt
+
1
−
1
View file @
3a406c4e
...
...
@@ -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)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment