From d1ab3c934931dce8b5a223721071bfbe90ecf4c8 Mon Sep 17 00:00:00 2001 From: pgovyadi Date: Thu, 4 Aug 2016 16:32:01 -0500 Subject: [PATCH] Changes to get netmets to compile and work --- CMakeLists.txt | 11 +++++++---- main.cpp | 1 + 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2d533c2..ae973c4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,6 +23,7 @@ find_package(Boost REQUIRED) #find the GLUT library for visualization find_package(OpenGL REQUIRED) + find_package(GLUT REQUIRED) #find the pthreads package @@ -41,10 +42,10 @@ if ( MSVC ) endif ( MSVC ) include_directories( - ${OpenGL_INCLUDE_DIRS} + ${OPENGL_INCLUDE_DIRS} ${GLUT_INCLUDE_DIR} ${STIM_INCLUDE_DIRS} - ${ANN_INCLUDE_DIR} + ${ANN_INCLUDE_DIR} ${Boost_INCLUDE_DIR} ) @@ -60,10 +61,12 @@ add_executable(netmets #set the link libraries target_link_libraries(netmets - ${OpenGL_LIBRARIES} +# ${OpenGL_LIBRARIES} + ${OPENGL_gl_LIBRARY} + ${OPENGL_glu_LIBRARY} ${GLUT_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} - ${ANN_LIBRARY} + ${ANN_LIBRARY} ${X11_LIBRARIES} ) diff --git a/main.cpp b/main.cpp index be4b7b6..aac7aa1 100644 --- a/main.cpp +++ b/main.cpp @@ -5,6 +5,7 @@ //OpenGL includes #include +#include //STIM includes #include -- libgit2 0.21.4