conan-cmake fix if

7090dc1d · Wieland Morgenstern · 582a8852 · 7090dc1d
Commit 7090dc1d authored May 11, 2019 by Wieland Morgenstern
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 5 deletions

CMakeLists.txt CMakeLists.txt +12 -5

No files found.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -116,13 +116,20 @@ if(WIN32)
      message(STATUS "Downloading conan.cmake from https://github.com/conan-io/cmake-conan")
      file(DOWNLOAD "https://github.com/conan-io/cmake-conan/raw/v0.14/conan.cmake"
                    "${CMAKE_BINARY_DIR}/conan.cmake")
+    endif()
+    include(${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
-                               glfw/3.3@bincrafters/stable
-                               )
+    conan_add_remote(NAME bincrafters URL https://api.bintray.com/conan/bincrafters/public-conan)
+    conan_cmake_run(REQUIRES
+                             libpng/1.6.37@bincrafters/stable
+                             glew/2.1.0@bincrafters/stable
+                             glfw/3.3@bincrafters/stable
+                             #ceres-solver/1.12.0@jmdaly/testing
+                    BUILD missing
+                    )
+
+    message(STATUS "CONAN_LIBS: ${CONAN_LIBS}")

-    endif()
  endif()

 endif(WIN32)