diff --git a/CMakeLists.txt b/CMakeLists.txt index 8caa6b5d699bc194d66ef9ea9c1be13ef2dc33c4..af709679ab5a66a9f486515f84194346a2b3de89 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -45,6 +45,7 @@ conan_or_find_package(glew REQUIRED) conan_or_find_package(glm REQUIRED) find_package(OpenGL REQUIRED) conan_or_find_package(SDL2 REQUIRED) +conan_or_find_package(spdlog REQUIRED) conan_or_find_package(freeimage REQUIRED) add_subdirectory(library) diff --git a/conanfile.py b/conanfile.py index 318cd36830ec1b87134b20cb695b1d749505ed13..873f531e0466745cbfad7c3a2e27276919380d15 100644 --- a/conanfile.py +++ b/conanfile.py @@ -33,6 +33,7 @@ class ProjectPhoenix(ConanFile): ("catch/1.9.7@RWTH-VR/thirdparty"), ("cpplint/9883c51@RWTH-VR/thirdparty"), ("SDL2/2.0.5@RWTH-VR/thirdparty"), + ("spdlog/0.14.0@RWTH-VR/thirdparty"), ("trompeloeil/v25@RWTH-VR/thirdparty"), ("freeimage/3.17.0@RWTH-VR/thirdparty")) # comma separated list of requirements generators = "cmake" diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt index 9dc3d86d593f2fc9601dfe5c2a3cd346b3492080..55d86e25204425d270ce2be9b8ee0b1b3f3b89a6 100644 --- a/library/CMakeLists.txt +++ b/library/CMakeLists.txt @@ -37,6 +37,7 @@ target_link_libraries(phoenix ${CONAN_OR_CMAKE_boost} ${CONAN_OR_CMAKE_glm} ${CONAN_OR_CMAKE_SDL2} + ${CONAN_OR_CMAKE_spdlog} ${OPENGL_LIBRARIES} ${CONAN_OR_CMAKE_glew} ${CONAN_OR_CMAKE_freeimage}