Skip to content
Snippets Groups Projects
Commit 848bc0d9 authored by Joseph Walton-Rivers's avatar Joseph Walton-Rivers
Browse files

support both multi and single build modes

parent 143d3324
No related branches found
No related tags found
No related merge requests found
Pipeline #3313 failed
...@@ -33,7 +33,6 @@ build:f34-conan-xorg: ...@@ -33,7 +33,6 @@ build:f34-conan-xorg:
script: script:
- cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug - cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug
- cmake --build build - cmake --build build
- camke --build build -t test
artifacts: artifacts:
paths: paths:
- build/fggl/ - build/fggl/
......
...@@ -27,21 +27,32 @@ if (CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) ...@@ -27,21 +27,32 @@ if (CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
glm/0.9.9.8 glm/0.9.9.8
spdlog/1.10.0 spdlog/1.10.0
GENERATORS GENERATORS
cmake_find_package
cmake_find_package_multi cmake_find_package_multi
OPTIONS OPTIONS
glad:gl_profile=core glad:gl_profile=core
glad:gl_version=4.5 glad:gl_version=4.5
glad:extensions="GL_ARB_get_program_binary" 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_autodetect( settings BUILD_TYPE ${TYPE} )
conan_cmake_install( conan_cmake_install(
PATH_OR_REFERENCE . PATH_OR_REFERENCE .
BUILD missing BUILD missing
REMOTE connancenter
SETTINGS ${settings} SETTINGS ${settings}
) )
endforeach() endif()
execute_process( COMMAND ls ${CMAKE_BINARY_DIR} ) execute_process( COMMAND ls ${CMAKE_BINARY_DIR} )
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment