conan install glfw

582a8852 · Wieland Morgenstern · 36e59555 · 582a8852 · 582a8852
Commit 582a8852 authored May 11, 2019 by Wieland Morgenstern
Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 2 deletions

CMakeLists.txt CMakeLists.txt +3 -1

CMakeLists.txt lib/samples/sample-02-fullCmd/CMakeLists.txt +5 -1

No files found.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -118,7 +118,9 @@ if(WIN32)
                    "${CMAKE_BINARY_DIR}/conan.cmake")

      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()

--- a/lib/samples/sample-02-fullCmd/CMakeLists.txt
+++ b/lib/samples/sample-02-fullCmd/CMakeLists.txt
@@ -16,7 +16,11 @@ elseif(APPLE)
    target_include_directories(${CMD_NAME} PRIVATE /usr/local/include)
  endif()
 elseif(WINDOWS)
+  if(WIN_CHOCO)
+  	set(GLFW CONAN_PKG::glfw)
+  else()
    find_library(GLFW glfw3 HINTS "${CMAKE_EXTERNAL_LIB}/glfw" REQUIRED)
+  endif()
 endif()

 target_include_directories(${CMD_NAME} PRIVATE "${CMAKE_EXTERNAL_DEPS}/include")