Commit d1ab3c934931dce8b5a223721071bfbe90ecf4c8
1 parent
f68859b8
Changes to get netmets to compile and work
Showing
2 changed files
with
8 additions
and
4 deletions
Show diff stats
CMakeLists.txt
| @@ -23,6 +23,7 @@ find_package(Boost REQUIRED) | @@ -23,6 +23,7 @@ find_package(Boost REQUIRED) | ||
| 23 | 23 | ||
| 24 | #find the GLUT library for visualization | 24 | #find the GLUT library for visualization |
| 25 | find_package(OpenGL REQUIRED) | 25 | find_package(OpenGL REQUIRED) |
| 26 | + | ||
| 26 | find_package(GLUT REQUIRED) | 27 | find_package(GLUT REQUIRED) |
| 27 | 28 | ||
| 28 | #find the pthreads package | 29 | #find the pthreads package |
| @@ -41,10 +42,10 @@ if ( MSVC ) | @@ -41,10 +42,10 @@ if ( MSVC ) | ||
| 41 | endif ( MSVC ) | 42 | endif ( MSVC ) |
| 42 | 43 | ||
| 43 | include_directories( | 44 | include_directories( |
| 44 | - ${OpenGL_INCLUDE_DIRS} | 45 | + ${OPENGL_INCLUDE_DIRS} |
| 45 | ${GLUT_INCLUDE_DIR} | 46 | ${GLUT_INCLUDE_DIR} |
| 46 | ${STIM_INCLUDE_DIRS} | 47 | ${STIM_INCLUDE_DIRS} |
| 47 | - ${ANN_INCLUDE_DIR} | 48 | + ${ANN_INCLUDE_DIR} |
| 48 | ${Boost_INCLUDE_DIR} | 49 | ${Boost_INCLUDE_DIR} |
| 49 | ) | 50 | ) |
| 50 | 51 | ||
| @@ -60,10 +61,12 @@ add_executable(netmets | @@ -60,10 +61,12 @@ add_executable(netmets | ||
| 60 | 61 | ||
| 61 | #set the link libraries | 62 | #set the link libraries |
| 62 | target_link_libraries(netmets | 63 | target_link_libraries(netmets |
| 63 | - ${OpenGL_LIBRARIES} | 64 | +# ${OpenGL_LIBRARIES} |
| 65 | + ${OPENGL_gl_LIBRARY} | ||
| 66 | + ${OPENGL_glu_LIBRARY} | ||
| 64 | ${GLUT_LIBRARIES} | 67 | ${GLUT_LIBRARIES} |
| 65 | ${CMAKE_THREAD_LIBS_INIT} | 68 | ${CMAKE_THREAD_LIBS_INIT} |
| 66 | - ${ANN_LIBRARY} | 69 | + ${ANN_LIBRARY} |
| 67 | ${X11_LIBRARIES} | 70 | ${X11_LIBRARIES} |
| 68 | ) | 71 | ) |
| 69 | 72 |
main.cpp