Skip to content

S
stitchEm
Commit 582a8852 authored by Wieland Morgenstern's avatar Wieland Morgenstern
Browse files
Options

conan install glfw

parent 36e59555
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 2 deletions
CMakeLists.txt
View file @ 582a8852
...@@ -118,7 +118,9 @@ if(WIN32) ...@@ -118,7 +118,9 @@ if(WIN32)
"${CMAKE_BINARY_DIR}/conan.cmake") "${CMAKE_BINARY_DIR}/conan.cmake")
conan_add_remote(NAME bincrafters URL https://api.bintray.com/conan/bincrafters/public-conan) conan_add_remote(NAME bincrafters URL https://api.bintray.com/conan/bincrafters/public-conan)
conan_cmake_run(REQUIRES libpng/1.6.37@bincrafters/stable) conan_cmake_run(REQUIRES libpng/1.6.37@bincrafters/stable
glfw/3.3@bincrafters/stable
)
endif() endif()
endif() endif()
......
lib/samples/sample-02-fullCmd/CMakeLists.txt
View file @ 582a8852
...@@ -16,7 +16,11 @@ elseif(APPLE) ...@@ -16,7 +16,11 @@ elseif(APPLE)
target_include_directories(${CMD_NAME} PRIVATE /usr/local/include) target_include_directories(${CMD_NAME} PRIVATE /usr/local/include)
endif() endif()
elseif(WINDOWS) elseif(WINDOWS)
if(WIN_CHOCO)
set(GLFW CONAN_PKG::glfw)
else()
find_library(GLFW glfw3 HINTS "${CMAKE_EXTERNAL_LIB}/glfw" REQUIRED) find_library(GLFW glfw3 HINTS "${CMAKE_EXTERNAL_LIB}/glfw" REQUIRED)
endif()
endif() endif()
target_include_directories(${CMD_NAME} PRIVATE "${CMAKE_EXTERNAL_DEPS}/include") target_include_directories(${CMD_NAME} PRIVATE "${CMAKE_EXTERNAL_DEPS}/include")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment