diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 82f99cab31852ff13ad7d336f6bcd6bd804db461..28916eaf58075524ad572a94c0754304eeeb7670 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 1cbbb623a1f7b1e9b8794273b82c8126bdb29de5..815d902a812e46d0c0d19927082aaec3c04ef15f 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} )