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

ensure that cmake builds right

parent 7bc5d16f
No related branches found
No related tags found
No related merge requests found
cmake_minimum_required(VERSION 3.16) cmake_minimum_required(VERSION 3.16)
set(namespace "fggl") set(namespace "fggl")
# Define the project set(CONAN_BUILD_TYPE "Debug")
# Define the project
project(fggl project(fggl
VERSION 0.1 VERSION 0.1
DESCRIPTION "" DESCRIPTION ""
...@@ -24,9 +25,13 @@ endif() ...@@ -24,9 +25,13 @@ endif()
include(${CMAKE_BINARY_DIR}/conan_paths.cmake) include(${CMAKE_BINARY_DIR}/conan_paths.cmake)
include(${CMAKE_BINARY_DIR}/conan.cmake) include(${CMAKE_BINARY_DIR}/conan.cmake)
#conan_cmake_autodetect(settings)
conan_cmake_run(CONANFILE conanfile.txt # or relative build/conanfile.txt conan_cmake_run(CONANFILE conanfile.txt # or relative build/conanfile.txt
BUILD_TYPE ${CONAN_BUILD_TYPE}
BASIC_SETUP CMAKE_TARGETS BASIC_SETUP CMAKE_TARGETS
BUILD missing) BUILD missing
SETTINGS ${settings}
)
## ##
# end conan support # end conan support
## ##
......
...@@ -16,7 +16,7 @@ target_link_libraries(${PROJECT_NAME} PUBLIC glm::glm) ...@@ -16,7 +16,7 @@ target_link_libraries(${PROJECT_NAME} PUBLIC glm::glm)
# OpenGL Backend # OpenGL Backend
find_package( OpenGL REQUIRED ) find_package( OpenGL REQUIRED )
include_directories( ${OPENGL_INCLUDE_DIR} ) include_directories( ${OPENGL_INCLUDE_DIR} )
target_link_libraries(${PROJECT_NAME} PUBLIC opengl::opengl) target_link_libraries(${PROJECT_NAME} PUBLIC OpenGL::OpenGL)
# GLEW # GLEW
find_package( glad ) find_package( glad )
......
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