From 848bc0d987fba3d941e010c26454720fc9dfa150 Mon Sep 17 00:00:00 2001
From: Joseph Walton-Rivers <joseph@walton-rivers.uk>
Date: Thu, 21 Apr 2022 15:03:00 +0100
Subject: [PATCH] support both multi and single build modes
---
.gitlab-ci.yml | 1 -
CMakeLists.txt | 17 ++++++++++++++---
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 82f99ca..28916ea 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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/
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1cbbb62..815d902 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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}
)
- endforeach()
+ endif()
execute_process( COMMAND ls ${CMAKE_BINARY_DIR} )
--
GitLab