diff --git a/CMakeLists.txt b/CMakeLists.txt index deb1a82691820d002ef68e18dcfef42d5f54f630..b27ebd3a8fcc4eb7abd33d617e36fa5a9a1e9425 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,8 +1,9 @@ cmake_minimum_required(VERSION 3.16) set(namespace "fggl") -# Define the project +set(CONAN_BUILD_TYPE "Debug") +# Define the project project(fggl VERSION 0.1 DESCRIPTION "" @@ -24,9 +25,13 @@ endif() include(${CMAKE_BINARY_DIR}/conan_paths.cmake) include(${CMAKE_BINARY_DIR}/conan.cmake) +#conan_cmake_autodetect(settings) conan_cmake_run(CONANFILE conanfile.txt # or relative build/conanfile.txt + BUILD_TYPE ${CONAN_BUILD_TYPE} BASIC_SETUP CMAKE_TARGETS - BUILD missing) + BUILD missing + SETTINGS ${settings} + ) ## # end conan support ## diff --git a/fggl/gfx/ogl/CMakeLists.txt b/fggl/gfx/ogl/CMakeLists.txt index 37b3290ccfd3fdf85746602d3fc038501509e5f1..2fcb3d5015dacec9ccde3838901bd33598ccf622 100644 --- a/fggl/gfx/ogl/CMakeLists.txt +++ b/fggl/gfx/ogl/CMakeLists.txt @@ -16,7 +16,7 @@ target_link_libraries(${PROJECT_NAME} PUBLIC glm::glm) # OpenGL Backend find_package( OpenGL REQUIRED ) include_directories( ${OPENGL_INCLUDE_DIR} ) -target_link_libraries(${PROJECT_NAME} PUBLIC opengl::opengl) +target_link_libraries(${PROJECT_NAME} PUBLIC OpenGL::OpenGL) # GLEW find_package( glad )