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

fix the library includes for glfw

parent d98f247c
No related branches found
No related tags found
No related merge requests found
......@@ -17,8 +17,6 @@ if (CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
set(CMAKE_PREFIX_PATH ${CMAKE_BINARY_DIR} ${CMAKE_PREFIX_PATH})
include( cmake/conan.cmake )
execute_process( COMMAND ls ${CMAKE_BINARY_DIR} )
conan_cmake_configure(
REQUIRES
opengl/system
......@@ -37,7 +35,6 @@ if (CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
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 .
......
......@@ -23,21 +23,8 @@ rm -rf $CACHE
#
# build step
#
pushd builds/cli
cmake ../..
if [ $? -ne 0 ]
then
echo "[!] Cmake failed"
exit 1
fi
make
if [ $? -ne 0 ]
then
echo "[!] make failed"
exit 1
fi
popd
cmake -S . -B build -DCMAKE_BUILD_TYPE=debug
cmake --build build
#
# additional stuff
......
# Sources
find_package( glfw3 REQUIRED )
target_link_libraries(fggl PUBLIC glfw)
target_sources(fggl
PRIVATE
window.cpp
input.cpp
atlas.cpp
atlas.cpp
)
find_package( glfw3 )
if ( GLFW3_FOUND )
target_link_libraries(fggl PRIVATE glfw)
else()
message("GLFW couldn't be found - something strange is going on")
target_link_libraries(fggl PRIVATE glfw)
endif()
# OpenGL backend
add_subdirectory(ogl)
add_subdirectory(ogl4)
......
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