Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
G
Game Library
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Onuralp SEZER
Game Library
Commits
848bc0d9
Commit
848bc0d9
authored
2 years ago
by
Joseph Walton-Rivers
Browse files
Options
Downloads
Patches
Plain Diff
support both multi and single build modes
parent
143d3324
No related branches found
Branches containing commit
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
+0
-1
0 additions, 1 deletion
.gitlab-ci.yml
CMakeLists.txt
+14
-3
14 additions, 3 deletions
CMakeLists.txt
with
14 additions
and
4 deletions
.gitlab-ci.yml
+
0
−
1
View file @
848bc0d9
...
...
@@ -33,7 +33,6 @@ build:f34-conan-xorg:
script
:
-
cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug
-
cmake --build build
-
camke --build build -t test
artifacts
:
paths
:
-
build/fggl/
...
...
This diff is collapsed.
Click to expand it.
CMakeLists.txt
+
14
−
3
View file @
848bc0d9
...
...
@@ -27,21 +27,32 @@ if (CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
glm/0.9.9.8
spdlog/1.10.0
GENERATORS
cmake_find_package
cmake_find_package_multi
OPTIONS
glad:gl_profile=core
glad:gl_version=4.5
glad:extensions=
"GL_ARB_get_program_binary"
)
foreach
(
TYPE
${
CMAKE_CONFIGURATION_TYPES
}
)
if
(
CMAKE_CONFIGURATION_TYPES
)
foreach
(
TYPE
${
CMAKE_CONFIGURATION_TYPES
}
)
execute_process
(
COMMAND echo
"BUILD TYPE: "
${
TYPE
}
)
conan_cmake_autodetect
(
settings BUILD_TYPE
${
TYPE
}
)
conan_cmake_install
(
PATH_OR_REFERENCE .
BUILD missing
SETTINGS
${
settings
}
)
endforeach
()
else
()
conan_cmake_autodetect
(
settings BUILD_TYPE
${
TYPE
}
)
conan_cmake_install
(
PATH_OR_REFERENCE .
BUILD missing
REMOTE connancenter
SETTINGS
${
settings
}
)
endf
oreach
()
end
i
f
()
execute_process
(
COMMAND ls
${
CMAKE_BINARY_DIR
}
)
...
...
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