From 2a34aa72bc0d7d6552eaab5ea2fe5b73cc789946 Mon Sep 17 00:00:00 2001 From: Alec Jacobson Date: Thu, 10 Nov 2016 09:26:42 -0500 Subject: [PATCH] glfw missing libraries (how was this ever working?) Former-commit-id: feb26b33ec91eafc223b6cebe1bb915c95379bc1 --- shared/cmake/CMakeLists.txt | 3 ++- tutorial/{611_SLIM => 710_SLIM}/CMakeLists.txt | 0 tutorial/{611_SLIM => 710_SLIM}/main.cpp | 0 .../{611_SLIM.png.REMOVED.git-id => slim.png.REMOVED.git-id} | 0 4 files changed, 2 insertions(+), 1 deletion(-) rename tutorial/{611_SLIM => 710_SLIM}/CMakeLists.txt (100%) rename tutorial/{611_SLIM => 710_SLIM}/main.cpp (100%) rename tutorial/images/{611_SLIM.png.REMOVED.git-id => slim.png.REMOVED.git-id} (100%) diff --git a/shared/cmake/CMakeLists.txt b/shared/cmake/CMakeLists.txt index 63a945d1e..bae6d4447 100644 --- a/shared/cmake/CMakeLists.txt +++ b/shared/cmake/CMakeLists.txt @@ -401,7 +401,8 @@ if(LIBIGL_WITH_VIEWER) add_subdirectory("${NANOGUI_DIR}/ext/glfw" "glfw") set(VIEWER_INCLUDE_DIRS "${NANOGUI_DIR}/ext/glfw/include") - set(LIBIGL_VIEWER_EXTRA_LIBRARIES "glfw" ${OPENGL_gl_LIBRARY}) + #set(LIBIGL_VIEWER_EXTRA_LIBRARIES "glfw" ${OPENGL_gl_LIBRARY}) + set(LIBIGL_VIEWER_EXTRA_LIBRARIES "glfw" ${GLFW_LIBRARIES}) endif() ### GLEW for linux and windows diff --git a/tutorial/611_SLIM/CMakeLists.txt b/tutorial/710_SLIM/CMakeLists.txt similarity index 100% rename from tutorial/611_SLIM/CMakeLists.txt rename to tutorial/710_SLIM/CMakeLists.txt diff --git a/tutorial/611_SLIM/main.cpp b/tutorial/710_SLIM/main.cpp similarity index 100% rename from tutorial/611_SLIM/main.cpp rename to tutorial/710_SLIM/main.cpp diff --git a/tutorial/images/611_SLIM.png.REMOVED.git-id b/tutorial/images/slim.png.REMOVED.git-id similarity index 100% rename from tutorial/images/611_SLIM.png.REMOVED.git-id rename to tutorial/images/slim.png.REMOVED.git-id